diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 10:17:11 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-10 10:17:11 -0800 |
commit | a46699c9a32505cb5bbfd16f76e7d4a2c84a7705 (patch) | |
tree | 5c0bc91dd1c07ab95769f5749b3b58235c758d50 /include/asm-arm/arch-omap/hardware.h | |
parent | 7ed0175a462c4c30f6df6fac1cccac058f997739 (diff) | |
parent | b216c01829d0b73a468204e2e763c0a818b77a46 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-omap/hardware.h')
-rw-r--r-- | include/asm-arm/arch-omap/hardware.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/asm-arm/arch-omap/hardware.h b/include/asm-arm/arch-omap/hardware.h index 60201e1dd6a..5406b875c42 100644 --- a/include/asm-arm/arch-omap/hardware.h +++ b/include/asm-arm/arch-omap/hardware.h @@ -267,8 +267,6 @@ #define OMAP_LPG2_LCR (OMAP_LPG2_BASE + 0x00) #define OMAP_LPG2_PMR (OMAP_LPG2_BASE + 0x04) -#ifndef __ASSEMBLER__ - /* * --------------------------------------------------------------------------- * Processor specific defines @@ -277,13 +275,11 @@ #include "omap730.h" #include "omap1510.h" - -#ifdef CONFIG_ARCH_OMAP24XX #include "omap24xx.h" -#endif - #include "omap16xx.h" +#ifndef __ASSEMBLER__ + /* * --------------------------------------------------------------------------- * Board specific defines |