diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-29 01:11:23 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-29 01:11:23 -0400 |
| commit | 7b7e394185014e0f3bd8989cac937003f20ef9ce (patch) | |
| tree | 3beda5f979bba0aa9822534e239cf1b45f3be69c /include/asm-arm/arch-omap/hardware.h | |
| parent | ddc5d3414593e4d7ad7fbd33e7f7517fcc234544 (diff) | |
| parent | 693f7d362055261882659475d2ef022e32edbff1 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-arm/arch-omap/hardware.h')
| -rw-r--r-- | include/asm-arm/arch-omap/hardware.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-arm/arch-omap/hardware.h b/include/asm-arm/arch-omap/hardware.h index 5406b875c422..7909b729826c 100644 --- a/include/asm-arm/arch-omap/hardware.h +++ b/include/asm-arm/arch-omap/hardware.h | |||
| @@ -306,6 +306,10 @@ | |||
| 306 | #include "board-h4.h" | 306 | #include "board-h4.h" |
| 307 | #endif | 307 | #endif |
| 308 | 308 | ||
| 309 | #ifdef CONFIG_MACH_OMAP_APOLLON | ||
| 310 | #include "board-apollon.h" | ||
| 311 | #endif | ||
| 312 | |||
| 309 | #ifdef CONFIG_MACH_OMAP_OSK | 313 | #ifdef CONFIG_MACH_OMAP_OSK |
| 310 | #include "board-osk.h" | 314 | #include "board-osk.h" |
| 311 | #endif | 315 | #endif |
| @@ -314,10 +318,6 @@ | |||
| 314 | #include "board-voiceblue.h" | 318 | #include "board-voiceblue.h" |
| 315 | #endif | 319 | #endif |
| 316 | 320 | ||
| 317 | #ifdef CONFIG_MACH_NETSTAR | ||
| 318 | #include "board-netstar.h" | ||
| 319 | #endif | ||
| 320 | |||
| 321 | #endif /* !__ASSEMBLER__ */ | 321 | #endif /* !__ASSEMBLER__ */ |
| 322 | 322 | ||
| 323 | #endif /* __ASM_ARCH_OMAP_HARDWARE_H */ | 323 | #endif /* __ASM_ARCH_OMAP_HARDWARE_H */ |