Fix MALTA build; some prototypes were wrong and blew up when kobj method

signature checking was turned on.
This commit is contained in:
Juli Mallett 2009-06-12 22:49:35 +00:00
parent 13ace80b16
commit e11e04c939
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=194082
2 changed files with 5 additions and 4 deletions

View File

@ -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);

View File

@ -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");
}