diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
| commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
| tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /include/asm-arm/arch-ep93xx/hardware.h | |
| parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
Diffstat (limited to 'include/asm-arm/arch-ep93xx/hardware.h')
| -rw-r--r-- | include/asm-arm/arch-ep93xx/hardware.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/asm-arm/arch-ep93xx/hardware.h b/include/asm-arm/arch-ep93xx/hardware.h new file mode 100644 index 000000000000..9b69f454065d --- /dev/null +++ b/include/asm-arm/arch-ep93xx/hardware.h | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | /* | ||
| 2 | * linux/include/asm-arm/arch-ep93xx/hardware.h | ||
| 3 | */ | ||
| 4 | |||
| 5 | #include "ep93xx-regs.h" | ||
| 6 | |||
| 7 | #define pcibios_assign_all_busses() 0 | ||
| 8 | |||
| 9 | #include "platform.h" | ||
| 10 | |||
| 11 | #include "gesbc9312.h" | ||
| 12 | #include "ts72xx.h" | ||