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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
ppc
/
platforms
/
4xx
/
luan.c
diff --git
a/arch/ppc/platforms/4xx/luan.c
b/arch/ppc/platforms/4xx/luan.c
index
95359f7
..
5c37de2
100644
(file)
--- a/
arch/ppc/platforms/4xx/luan.c
+++ b/
arch/ppc/platforms/4xx/luan.c
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/platforms/4xx/luan.c
- *
* Luan board specific routines
*
* Matt Porter <mporter@kernel.crashing.org>
* Luan board specific routines
*
* Matt Porter <mporter@kernel.crashing.org>
@@
-28,7
+26,6
@@
#include <linux/delay.h>
#include <linux/ide.h>
#include <linux/initrd.h>
#include <linux/delay.h>
#include <linux/ide.h>
#include <linux/initrd.h>
-#include <linux/irq.h>
#include <linux/seq_file.h>
#include <linux/root_dev.h>
#include <linux/tty.h>
#include <linux/seq_file.h>
#include <linux/root_dev.h>
#include <linux/tty.h>
@@
-53,14
+50,7
@@
#include <syslib/ibm440gx_common.h>
#include <syslib/ibm440sp_common.h>
#include <syslib/ibm440gx_common.h>
#include <syslib/ibm440sp_common.h>
-/*
- * This is a horrible kludge, we eventually need to abstract this
- * generic PHY stuff, so the standard phy mode defines can be
- * easily used from arch code.
- */
-#include "../../../../drivers/net/ibm_emac/ibm_emac_phy.h"
-
-bd_t __res;
+extern bd_t __res;
static struct ibm44x_clocks clocks __initdata;
static struct ibm44x_clocks clocks __initdata;
@@
-287,8
+277,8
@@
luan_early_serial_map(void)
port.irq = UART0_INT;
port.uartclk = clocks.uart0;
port.regshift = 0;
port.irq = UART0_INT;
port.uartclk = clocks.uart0;
port.regshift = 0;
- port.iotype =
SERIAL_
IO_MEM;
- port.flags =
ASYNC_BOOT_AUTOCONF | ASYNC
_SKIP_TEST;
+ port.iotype =
UP
IO_MEM;
+ port.flags =
UPF_BOOT_AUTOCONF | UPF
_SKIP_TEST;
port.line = 0;
if (early_serial_setup(&port) != 0) {
port.line = 0;
if (early_serial_setup(&port) != 0) {
@@
-363,16
+353,7
@@
luan_setup_arch(void)
void __init platform_init(unsigned long r3, unsigned long r4,
unsigned long r5, unsigned long r6, unsigned long r7)
{
void __init platform_init(unsigned long r3, unsigned long r4,
unsigned long r5, unsigned long r6, unsigned long r7)
{
- parse_bootinfo(find_bootinfo());
-
- /*
- * If we were passed in a board information, copy it into the
- * residual data area.
- */
- if (r3)
- __res = *(bd_t *)(r3 + KERNELBASE);
-
- ibm44x_platform_init();
+ ibm44x_platform_init(r3, r4, r5, r6, r7);
ppc_md.setup_arch = luan_setup_arch;
ppc_md.show_cpuinfo = luan_show_cpuinfo;
ppc_md.setup_arch = luan_setup_arch;
ppc_md.show_cpuinfo = luan_show_cpuinfo;