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 core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
ppc
/
platforms
/
4xx
/
bubinga.c
diff --git
a/arch/ppc/platforms/4xx/bubinga.c
b/arch/ppc/platforms/4xx/bubinga.c
index
3678abf
..
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>
@@
-89,7
+88,7
@@
bubinga_early_serial_map(void)
* by 16.
*/
uart_div = (mfdcr(DCRN_CPC0_UCR_BASE) & DCRN_CPC0_UCR_U0DIV);
* by 16.
*/
uart_div = (mfdcr(DCRN_CPC0_UCR_BASE) & DCRN_CPC0_UCR_U0DIV);
- uart_clock = __res.bi_p
llouta_
freq / uart_div;
+ uart_clock = __res.bi_p
roc
freq / uart_div;
/* Setup serial port access */
memset(&port, 0, sizeof(port));
/* Setup serial port access */
memset(&port, 0, sizeof(port));
@@
-97,8
+96,8
@@
bubinga_early_serial_map(void)
port.irq = ACTING_UART0_INT;
port.uartclk = uart_clock;
port.regshift = 0;
port.irq = ACTING_UART0_INT;
port.uartclk = uart_clock;
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) {
@@
-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
}