diff options
| author | Grant Likely <[email protected]> | 2007-11-20 08:19:56 -0700 |
|---|---|---|
| committer | Grant Likely <[email protected]> | 2007-11-20 08:19:56 -0700 |
| commit | f92edbd8a0ef16a2b9127cbb564c09685728e4b0 (patch) | |
| tree | ae33aacff092561e2c64eabc11a8adc5e2acea6b /include/asm-arm | |
| parent | efe33035acd5f7c13963a4d52e5aac1b68612ae4 (diff) | |
| parent | 9a337ddc154a10a26f117fd147b009abcdeba75a (diff) | |
Merge branch 'origin' into kconfig-for-1.3.1
Diffstat (limited to 'include/asm-arm')
| -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 8bb0c475236..b868e38a3ef 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 */ |