diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-23 17:13:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-23 17:13:43 -0500 |
| commit | 88e3c1da8b3258a81c5c81d4e7e22557b7d71ba7 (patch) | |
| tree | ab518773c0ff4606f1a57d00b5931332a7e1d96e /arch/ppc/boot/common/ns16550.c | |
| parent | fa4fa40a990f8f4eff65476bef32007c154bbac0 (diff) | |
| parent | b0e6e962992b76580f4900b166a337bad7c1e81b (diff) | |
Merge branch 'master'
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 | ||