diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 11:31:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 11:31:02 -0800 |
| commit | bb4bc81a234c66e8d8a4475110fa2d7988a34671 (patch) | |
| tree | dd97395a565e8e6fc05f58bb0d3cba8f300d114d /include/asm-arm/arch-s3c2410/uncompress.h | |
| parent | adac1665234dd966990af846eccd20b7f4923279 (diff) | |
| parent | 14e54cc391e22bd564993583464577e4e34a2701 (diff) | |
| download | talos-op-linux-bb4bc81a234c66e8d8a4475110fa2d7988a34671.tar.gz talos-op-linux-bb4bc81a234c66e8d8a4475110fa2d7988a34671.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-s3c2410/uncompress.h')
| -rw-r--r-- | include/asm-arm/arch-s3c2410/uncompress.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-arm/arch-s3c2410/uncompress.h b/include/asm-arm/arch-s3c2410/uncompress.h index ddd1578a7ee0..4367ec054b51 100644 --- a/include/asm-arm/arch-s3c2410/uncompress.h +++ b/include/asm-arm/arch-s3c2410/uncompress.h @@ -35,13 +35,13 @@ #undef S3C2410_GPIOREG #undef S3C2410_WDOGREG -#define S3C2410_GPIOREG(x) ((S3C2410_PA_GPIO + (x))) -#define S3C2410_WDOGREG(x) ((S3C2410_PA_WATCHDOG + (x))) +#define S3C2410_GPIOREG(x) ((S3C24XX_PA_GPIO + (x))) +#define S3C2410_WDOGREG(x) ((S3C24XX_PA_WATCHDOG + (x))) /* how many bytes we allow into the FIFO at a time in FIFO mode */ #define FIFO_MAX (14) -#define uart_base S3C2410_PA_UART + (0x4000*CONFIG_S3C2410_LOWLEVEL_UART_PORT) +#define uart_base S3C24XX_PA_UART + (0x4000*CONFIG_S3C2410_LOWLEVEL_UART_PORT) static __inline__ void uart_wr(unsigned int reg, unsigned int val) |
