git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/sam/kernel/linux-2.6/
[pandora-kernel.git]
/
arch
/
ppc
/
platforms
/
4xx
/
ebony.c
diff --git
a/arch/ppc/platforms/4xx/ebony.c
b/arch/ppc/platforms/4xx/ebony.c
index
64ebae1
..
f0f9cc8
100644
(file)
--- a/
arch/ppc/platforms/4xx/ebony.c
+++ b/
arch/ppc/platforms/4xx/ebony.c
@@
-1,6
+1,4
@@
/*
/*
- * arch/ppc/platforms/4xx/ebony.c
- *
* Ebony board specific routines
*
* Matt Porter <mporter@kernel.crashing.org>
* Ebony board specific routines
*
* Matt Porter <mporter@kernel.crashing.org>
@@
-15,7
+13,6
@@
* option) any later version.
*/
* option) any later version.
*/
-#include <linux/config.h>
#include <linux/stddef.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/stddef.h>
#include <linux/kernel.h>
#include <linux/init.h>
@@
-225,8
+222,8
@@
ebony_early_serial_map(void)
port.irq = 0;
port.uartclk = clocks.uart0;
port.regshift = 0;
port.irq = 0;
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) {