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 master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[pandora-kernel.git]
/
arch
/
ppc
/
platforms
/
4xx
/
bubinga.c
diff --git
a/arch/ppc/platforms/4xx/bubinga.c
b/arch/ppc/platforms/4xx/bubinga.c
index
0fe8da1
..
75857b3
100644
(file)
--- a/
arch/ppc/platforms/4xx/bubinga.c
+++ b/
arch/ppc/platforms/4xx/bubinga.c
@@
-10,7
+10,6
@@
* or implied.
*/
* or implied.
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/smp.h>
#include <linux/threads.h>
#include <linux/init.h>
#include <linux/smp.h>
#include <linux/threads.h>
@@
-98,7
+97,7
@@
bubinga_early_serial_map(void)
port.uartclk = uart_clock;
port.regshift = 0;
port.iotype = UPIO_MEM;
port.uartclk = uart_clock;
port.regshift = 0;
port.iotype = UPIO_MEM;
- port.flags =
ASYNC_BOOT_AUTOCONF | ASYNC
_SKIP_TEST;
+ 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) {
@@
-117,6
+116,7
@@
bubinga_early_serial_map(void)
void __init
bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
{
void __init
bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
{
+#ifdef CONFIG_PCI
unsigned int bar_response, bar;
/*
unsigned int bar_response, bar;
/*
@@
-212,6
+212,7
@@
bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
printk(" ptm2ms\t0x%x\n", in_le32(&(pcip->ptm2ms)));
printk(" ptm2la\t0x%x\n", in_le32(&(pcip->ptm2la)));
printk(" ptm2ms\t0x%x\n", in_le32(&(pcip->ptm2ms)));
printk(" ptm2la\t0x%x\n", in_le32(&(pcip->ptm2la)));
+#endif
#endif
}
#endif
}