diff options
| author | Wolfgang Denk | 2009-12-01 12:10:51 +0100 |
|---|---|---|
| committer | Wolfgang Denk | 2009-12-01 12:10:51 +0100 |
| commit | 57bf140ac66f95c9c36c494e4d027551b5477b01 (patch) | |
| tree | 78cc2602ee9dca3284e47f38d29380171fb53646 /board/mpl/vcma9 | |
| parent | 34ddbd171ba154e9afd83f07a07ad8b57ac592e3 (diff) | |
| parent | 71636fa7c3de63de29c0f514d5c725eccb011657 (diff) | |
Merge branch 'next-sync' of git://git.denx.de/u-boot-arm into next
Diffstat (limited to 'board/mpl/vcma9')
| -rw-r--r-- | board/mpl/vcma9/vcma9.c | 2 | ||||
| -rw-r--r-- | board/mpl/vcma9/vcma9.h | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/board/mpl/vcma9/vcma9.c b/board/mpl/vcma9/vcma9.c index 4d8b579caa8..1835677a885 100644 --- a/board/mpl/vcma9/vcma9.c +++ b/board/mpl/vcma9/vcma9.c @@ -27,7 +27,7 @@ #include <common.h> #include <netdev.h> -#include <s3c2410.h> +#include <asm/arch/s3c24x0_cpu.h> #include <stdio_dev.h> #include <i2c.h> diff --git a/board/mpl/vcma9/vcma9.h b/board/mpl/vcma9/vcma9.h index f46e0e4c58d..94fd2faf3bf 100644 --- a/board/mpl/vcma9/vcma9.h +++ b/board/mpl/vcma9/vcma9.h @@ -25,7 +25,7 @@ * Global routines used for VCMA9 *****************************************************************************/ -#include <s3c2410.h> +#include <asm/arch/s3c24x0_cpu.h> extern int mem_test(unsigned long start, unsigned long ramsize,int mode); @@ -118,13 +118,13 @@ static inline u32 NF_Read_ECC(void) /* VCMA9 PLD regsiters */ typedef struct { - S3C24X0_REG8 ID; - S3C24X0_REG8 NIC; - S3C24X0_REG8 CAN; - S3C24X0_REG8 MISC; - S3C24X0_REG8 GPCD; - S3C24X0_REG8 BOARD; - S3C24X0_REG8 SDRAM; + u8 ID; + u8 NIC; + u8 CAN; + u8 MISC; + u8 GPCD; + u8 BOARD; + u8 SDRAM; } /*__attribute__((__packed__))*/ VCMA9_PLD; #define VCMA9_PLD_BASE 0x2C000100 |