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 /arch/ppc/boot/common/ns16550.c | |
| 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 'arch/ppc/boot/common/ns16550.c')
| -rw-r--r-- | arch/ppc/boot/common/ns16550.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/ppc/boot/common/ns16550.c b/arch/ppc/boot/common/ns16550.c index 26818bbb6cff..4f00c93ac870 100644 --- a/arch/ppc/boot/common/ns16550.c +++ b/arch/ppc/boot/common/ns16550.c | |||
| @@ -8,6 +8,9 @@ | |||
| 8 | #include <linux/serial_reg.h> | 8 | #include <linux/serial_reg.h> |
| 9 | #include <asm/serial.h> | 9 | #include <asm/serial.h> |
| 10 | 10 | ||
| 11 | #if defined(CONFIG_XILINX_VIRTEX) | ||
| 12 | #include <platforms/4xx/xparameters/xparameters.h> | ||
| 13 | #endif | ||
| 11 | #include "nonstdio.h" | 14 | #include "nonstdio.h" |
| 12 | #include "serial.h" | 15 | #include "serial.h" |
| 13 | 16 | ||