diff options
| author | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-03-18 02:44:31 -0400 |
| commit | 2f633928cbba8a5858bb39b11e7219a41b0fbef5 (patch) | |
| tree | 9a82f4b7f2c3afe4b0208d8e44ea61bae90a7d22 /include/asm-arm/plat-s3c/uncompress.h | |
| parent | 5e226e4d9016daee170699f8a4188a5505021756 (diff) | |
| parent | bde4f8fa8db2abd5ac9c542d76012d0fedab050f (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-arm/plat-s3c/uncompress.h')
| -rw-r--r-- | include/asm-arm/plat-s3c/uncompress.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-arm/plat-s3c/uncompress.h b/include/asm-arm/plat-s3c/uncompress.h index b5e6208175d1..19b9eda39485 100644 --- a/include/asm-arm/plat-s3c/uncompress.h +++ b/include/asm-arm/plat-s3c/uncompress.h | |||
| @@ -27,8 +27,8 @@ static void arch_detect_cpu(void); | |||
| 27 | 27 | ||
| 28 | /* defines for UART registers */ | 28 | /* defines for UART registers */ |
| 29 | 29 | ||
| 30 | #include "asm/plat-s3c/regs-serial.h" | 30 | #include <asm/plat-s3c/regs-serial.h> |
| 31 | #include "asm/plat-s3c/regs-watchdog.h" | 31 | #include <asm/plat-s3c/regs-watchdog.h> |
| 32 | 32 | ||
| 33 | /* working in physical space... */ | 33 | /* working in physical space... */ |
| 34 | #undef S3C2410_WDOGREG | 34 | #undef S3C2410_WDOGREG |