diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-12-18 14:52:04 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-12-18 14:52:04 +0000 |
| commit | 7f2754378f3522a42daafdbb9d2385f341008454 (patch) | |
| tree | 7a6223f270cdf53067a70c2e86b2190d3577c23d /arch/arm/plat-s3c/include/plat/debug-macro.S | |
| parent | c6ad115876763e4f15055982ecb9579cb7abab5f (diff) | |
| parent | a9c5d23ac724a3b908833cafbbbd49abe4741b86 (diff) | |
Merge branch 'next-s3c64xx' into next-merged
Diffstat (limited to 'arch/arm/plat-s3c/include/plat/debug-macro.S')
| -rw-r--r-- | arch/arm/plat-s3c/include/plat/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c/include/plat/debug-macro.S b/arch/arm/plat-s3c/include/plat/debug-macro.S index 4aa7e2e6c001..3634d4e3708b 100644 --- a/arch/arm/plat-s3c/include/plat/debug-macro.S +++ b/arch/arm/plat-s3c/include/plat/debug-macro.S @@ -20,7 +20,7 @@ .endm #ifndef fifo_level -#define fifo_level fifo_level_s3c2410 +#define fifo_level fifo_level_s3c2440 #endif .macro fifo_full_s3c2440 rd, rx |