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
x86: use generic per-device dma coherent allocator
[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
4009f49
..
cd696be
100644
(file)
--- a/
arch/ppc/platforms/4xx/bubinga.c
+++ b/
arch/ppc/platforms/4xx/bubinga.c
@@
-21,6
+21,7
@@
#include <linux/tty.h>
#include <linux/serial.h>
#include <linux/serial_core.h>
#include <linux/tty.h>
#include <linux/serial.h>
#include <linux/serial_core.h>
+#include <linux/serial_8250.h>
#include <asm/system.h>
#include <asm/pci-bridge.h>
#include <asm/system.h>
#include <asm/pci-bridge.h>
@@
-116,6
+117,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;
/*
@@
-196,7
+198,7
@@
bios_fixup(struct pci_controller *hose, struct pcil0_regs *pcip)
hose->first_busno, PCI_SLOT(hose->first_busno),
PCI_FUNC(hose->first_busno), bar, bar_response);
}
hose->first_busno, PCI_SLOT(hose->first_busno),
PCI_FUNC(hose->first_busno), bar, bar_response);
}
- /* end work
ar
round */
+ /* end work
a
round */
#ifdef DEBUG
printk("PCI bridge regs after fixup \n");
#ifdef DEBUG
printk("PCI bridge regs after fixup \n");
@@
-211,6
+213,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
}