diff options
| author | Juli Mallett <jmallett@FreeBSD.org> | 2009-06-12 22:49:35 +0000 |
|---|---|---|
| committer | Juli Mallett <jmallett@FreeBSD.org> | 2009-06-12 22:49:35 +0000 |
| commit | e11e04c9394e86345d5c49b5a9628f9082791f19 (patch) | |
| tree | de24906e0c6bf0e772299fefd693b32a1682df79 /sys/mips | |
| parent | 13ace80b16cd11225b0c0a8ee13c883d5e7aca73 (diff) | |
Notes
Diffstat (limited to 'sys/mips')
| -rw-r--r-- | sys/mips/malta/gt_pci.c | 4 | ||||
| -rw-r--r-- | sys/mips/mips/mainbus.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sys/mips/malta/gt_pci.c b/sys/mips/malta/gt_pci.c index e8f7ffd96a91..f0180f6e6667 100644 --- a/sys/mips/malta/gt_pci.c +++ b/sys/mips/malta/gt_pci.c @@ -370,7 +370,7 @@ gt_pci_conf_setup(struct gt_pci_softc *sc, int bus, int slot, int func, } static uint32_t -gt_pci_read_config(device_t dev, int bus, int slot, int func, int reg, +gt_pci_read_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg, int bytes) { struct gt_pci_softc *sc = device_get_softc(dev); @@ -440,7 +440,7 @@ gt_pci_read_config(device_t dev, int bus, int slot, int func, int reg, } static void -gt_pci_write_config(device_t dev, int bus, int slot, int func, int reg, +gt_pci_write_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg, uint32_t data, int bytes) { struct gt_pci_softc *sc = device_get_softc(dev); diff --git a/sys/mips/mips/mainbus.c b/sys/mips/mips/mainbus.c index 1f6b00350f65..d1571e4cdba6 100644 --- a/sys/mips/mips/mainbus.c +++ b/sys/mips/mips/mainbus.c @@ -76,7 +76,7 @@ static int mainbus_deactivate_resource(device_t, device_t, int, int, static int mainbus_release_resource(device_t, device_t, int, int, struct resource *); static int mainbus_setup_intr(device_t, device_t, struct resource *, - int flags, int (*)(void *), void *, void **); + int flags, driver_filter_t, void (*)(void *), void *, void **); static int mainbus_teardown_intr(device_t, device_t, struct resource *, void *); @@ -319,7 +319,8 @@ mainbus_release_resource(device_t bus, device_t child, int type, int rid, */ static int mainbus_setup_intr(device_t bus, device_t child, struct resource *irq, - int flags, int (*ihand)(void *), void *arg, void **cookiep) + int flags, driver_filter_t filter, void (*ihand)(void *), void *arg, + void **cookiep) { panic("can never mainbus_setup_intr"); } |
