diff options
| author | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 17:24:23 -0400 |
|---|---|---|
| committer | Sam Ravnborg <sam@mars.ravnborg.org> | 2006-07-03 17:24:23 -0400 |
| commit | 05668381140309088443bf5dc53add4104610fbb (patch) | |
| tree | ed53039717390e1a71ff16209281b1f1c8d3e6be /include/asm-arm/arch-omap/hardware.h | |
| parent | 34c162f79e374556dd1384437f0dab558b5dc657 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/sam/kernel/linux-2.6/
Diffstat (limited to 'include/asm-arm/arch-omap/hardware.h')
| -rw-r--r-- | include/asm-arm/arch-omap/hardware.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-arm/arch-omap/hardware.h b/include/asm-arm/arch-omap/hardware.h index c7d9e857795d..481048d65214 100644 --- a/include/asm-arm/arch-omap/hardware.h +++ b/include/asm-arm/arch-omap/hardware.h | |||
| @@ -297,6 +297,10 @@ | |||
| 297 | #include "board-perseus2.h" | 297 | #include "board-perseus2.h" |
| 298 | #endif | 298 | #endif |
| 299 | 299 | ||
| 300 | #ifdef CONFIG_MACH_OMAP_FSAMPLE | ||
| 301 | #include "board-fsample.h" | ||
| 302 | #endif | ||
| 303 | |||
| 300 | #ifdef CONFIG_MACH_OMAP_H3 | 304 | #ifdef CONFIG_MACH_OMAP_H3 |
| 301 | #include "board-h3.h" | 305 | #include "board-h3.h" |
| 302 | #endif | 306 | #endif |