Commit 1c05f11e authored by Ivan Kokshaysky's avatar Ivan Kokshaysky Committed by Richard Henderson

[PATCH] compile fixes

- iovec stuff in linux/uio.h is needed for CONFIG_OSF4_COMPAT;
- pcibios_{read,write}_config_xx has gone - replaced with
  respective pci_bus_xx functions.

Ivan.
parent 248aa132
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/ipc.h> #include <linux/ipc.h>
#include <linux/namei.h> #include <linux/namei.h>
#include <linux/uio.h>
#include <asm/fpu.h> #include <asm/fpu.h>
#include <asm/io.h> #include <asm/io.h>
......
...@@ -76,12 +76,14 @@ nautilus_map_irq(struct pci_dev *dev, u8 slot, u8 pin) ...@@ -76,12 +76,14 @@ nautilus_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
void void
nautilus_kill_arch(int mode) nautilus_kill_arch(int mode)
{ {
struct pci_bus *bus = pci_isa_hose->bus;
switch (mode) { switch (mode) {
case LINUX_REBOOT_CMD_RESTART: case LINUX_REBOOT_CMD_RESTART:
if (! alpha_using_srm) { if (! alpha_using_srm) {
u8 t8; u8 t8;
pcibios_read_config_byte(0, 0x38, 0x43, &t8); pci_bus_read_config_byte(bus, 0x38, 0x43, &t8);
pcibios_write_config_byte(0, 0x38, 0x43, t8 | 0x80); pci_bus_write_config_byte(bus, 0x38, 0x43, t8 | 0x80);
outb(1, 0x92); outb(1, 0x92);
outb(0, 0x92); outb(0, 0x92);
/* NOTREACHED */ /* NOTREACHED */
...@@ -91,7 +93,7 @@ nautilus_kill_arch(int mode) ...@@ -91,7 +93,7 @@ nautilus_kill_arch(int mode)
case LINUX_REBOOT_CMD_POWER_OFF: case LINUX_REBOOT_CMD_POWER_OFF:
{ {
u32 pmuport; u32 pmuport;
pcibios_read_config_dword(0, 0x88, 0x10, &pmuport); pci_bus_read_config_dword(bus, 0x88, 0x10, &pmuport);
pmuport &= 0xfffe; pmuport &= 0xfffe;
outl(0xffff, pmuport); /* clear pending events */ outl(0xffff, pmuport); /* clear pending events */
outw(0x2000, pmuport+4); /* power off */ outw(0x2000, pmuport+4); /* power off */
......
...@@ -77,7 +77,7 @@ alphabook1_init_arch(void) ...@@ -77,7 +77,7 @@ alphabook1_init_arch(void)
static void __init static void __init
sio_pci_route(void) sio_pci_route(void)
{ {
pcibios_write_config_dword(0, PCI_DEVFN(7, 0), 0x60, pci_bus_write_config_dword(pci_isa_hose->bus, PCI_DEVFN(7, 0), 0x60,
alpha_mv.sys.sio.route_tab); alpha_mv.sys.sio.route_tab);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment