diff options
author | Jon Loeliger <jdl@freescale.com> | 2007-11-20 14:34:57 -0600 |
---|---|---|
committer | Jon Loeliger <jdl@freescale.com> | 2007-11-20 14:34:57 -0600 |
commit | 890e9413c0af74a3d74f37d9ab6d19784990fa0c (patch) | |
tree | 0e802d5d143e09751f85c76bf02f94aca023d077 /include/asm-arm/arch-at91rm9200/hardware.h | |
parent | 1d8a49eca1c7bdc8db1c47a92f9014a29ead03ae (diff) | |
parent | 9a337ddc154a10a26f117fd147b009abcdeba75a (diff) |
Merge commit 'remotes/wd/master'
Diffstat (limited to 'include/asm-arm/arch-at91rm9200/hardware.h')
-rw-r--r-- | include/asm-arm/arch-at91rm9200/hardware.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-arm/arch-at91rm9200/hardware.h b/include/asm-arm/arch-at91rm9200/hardware.h index 8bb0c47523..b868e38a3e 100644 --- a/include/asm-arm/arch-at91rm9200/hardware.h +++ b/include/asm-arm/arch-at91rm9200/hardware.h @@ -24,8 +24,6 @@ #ifndef __ASSEMBLY__ #include "AT91RM9200.h" -#else -#include "AT91RM9200_inc.h" #endif /* Virtual and Physical base address for system peripherals */ |