projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../linux-2.6
[powerpc.git]
/
arch
/
ppc
/
platforms
/
radstone_ppc7d.c
diff --git
a/arch/ppc/platforms/radstone_ppc7d.c
b/arch/ppc/platforms/radstone_ppc7d.c
index
6f97911
..
1b1e7c5
100644
(file)
--- a/
arch/ppc/platforms/radstone_ppc7d.c
+++ b/
arch/ppc/platforms/radstone_ppc7d.c
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/platforms/radstone_ppc7d.c
- *
* Board setup routines for the Radstone PPC7D boards.
*
* Author: James Chapman <jchapman@katalix.com>
* Board setup routines for the Radstone PPC7D boards.
*
* Author: James Chapman <jchapman@katalix.com>
@@
-40,6
+38,7
@@
#include <linux/serial_core.h>
#include <linux/mv643xx.h>
#include <linux/netdevice.h>
#include <linux/serial_core.h>
#include <linux/mv643xx.h>
#include <linux/netdevice.h>
+#include <linux/platform_device.h>
#include <asm/system.h>
#include <asm/pgtable.h>
#include <asm/system.h>
#include <asm/pgtable.h>
@@
-99,7
+98,7
@@
static void __init ppc7d_early_serial_map(void)
serial_req.uartclk = UART_CLK;
serial_req.irq = 4;
serial_req.flags = STD_COM_FLAGS;
serial_req.uartclk = UART_CLK;
serial_req.irq = 4;
serial_req.flags = STD_COM_FLAGS;
- serial_req.iotype =
SERIAL_
IO_MEM;
+ serial_req.iotype =
UP
IO_MEM;
serial_req.membase = (u_char *) PPC7D_SERIAL_0;
gen550_init(0, &serial_req);
serial_req.membase = (u_char *) PPC7D_SERIAL_0;
gen550_init(0, &serial_req);