diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-04-02 00:24:33 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-04-02 00:24:33 +0200 |
| commit | dfc91c33957c95da34e3888dc87912d5c15a7603 (patch) | |
| tree | d5fd6bd3818d817ea618bb9c19330633a71ab1bb /include/asm-arm | |
| parent | c123098035be8bae3859bbfbd06861f197c07631 (diff) | |
| parent | 0fc4f64c59873a47d555dd66bad25797d4ecb0ed (diff) | |
| download | u-boot-imx-dfc91c33957c95da34e3888dc87912d5c15a7603.zip u-boot-imx-dfc91c33957c95da34e3888dc87912d5c15a7603.tar.gz u-boot-imx-dfc91c33957c95da34e3888dc87912d5c15a7603.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/arch-arm720t/hardware.h | 4 | ||||
| -rw-r--r-- | include/asm-arm/arch-s3c4510b/hardware.h (renamed from include/asm-arm/arch-arm720t/s3c4510b.h) | 0 |
2 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-arm/arch-arm720t/hardware.h b/include/asm-arm/arch-arm720t/hardware.h index 3056ca7..ec053c9 100644 --- a/include/asm-arm/arch-arm720t/hardware.h +++ b/include/asm-arm/arch-arm720t/hardware.h @@ -24,9 +24,7 @@ * MA 02111-1307 USA */ -#if defined(CONFIG_S3C4510B) -#include <asm-arm/arch-arm720t/s3c4510b.h> -#elif defined(CONFIG_NETARM) +#if defined(CONFIG_NETARM) #include <asm-arm/arch-arm720t/netarm_registers.h> #elif defined(CONFIG_IMPA7) /* include IMPA7 specific hardware file if there was one */ diff --git a/include/asm-arm/arch-arm720t/s3c4510b.h b/include/asm-arm/arch-s3c4510b/hardware.h index 6b8c8ed..6b8c8ed 100644 --- a/include/asm-arm/arch-arm720t/s3c4510b.h +++ b/include/asm-arm/arch-s3c4510b/hardware.h |