git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
ppc
/
boot
/
common
/
ns16550.c
diff --git
a/arch/ppc/boot/common/ns16550.c
b/arch/ppc/boot/common/ns16550.c
index
26818bb
..
fc5b720
100644
(file)
--- a/
arch/ppc/boot/common/ns16550.c
+++ b/
arch/ppc/boot/common/ns16550.c
@@
-2,12
+2,14
@@
* COM1 NS16550 support
*/
* COM1 NS16550 support
*/
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/serial.h>
#include <linux/serial_reg.h>
#include <asm/serial.h>
#include <linux/types.h>
#include <linux/serial.h>
#include <linux/serial_reg.h>
#include <asm/serial.h>
+#if defined(CONFIG_XILINX_VIRTEX)
+#include <platforms/4xx/xparameters/xparameters.h>
+#endif
#include "nonstdio.h"
#include "serial.h"
#include "nonstdio.h"
#include "serial.h"