diff options
| -rw-r--r-- | device/agp_device.c | 18 | ||||
| -rw-r--r-- | include/device/agp.h | 2 |
2 files changed, 8 insertions, 12 deletions
diff --git a/device/agp_device.c b/device/agp_device.c index b7dbad359fce..0cfbe159a882 100644 --- a/device/agp_device.c +++ b/device/agp_device.c @@ -55,17 +55,13 @@ unsigned int agp_scan_bridge(struct device *dev, unsigned int max) } /** Default device operations for AGP bridges. */ -static const struct pci_operations agp_bus_ops_pci = { - .set_subsystem = 0, -}; const struct device_operations default_agp_ops_bus = { - .read_resources = pci_bus_read_resources, - .set_resources = pci_set_resources, - .enable_resources = pci_bus_enable_resources, - .init = 0, - .scan_bus = agp_scan_bridge, - .enable = 0, - .reset_bus = pci_bus_reset, - .ops_pci = &agp_bus_ops_pci, + .phase3_scan = agp_scan_bridge, + .phase4_read_resources = pci_bus_read_resources, + .phase4_set_resources = pci_set_resources, + .phase5_enable_resources = pci_bus_enable_resources, + .phase6_init = 0, + .phase3_enable = 0, + .reset_bus = pci_bus_reset, }; diff --git a/include/device/agp.h b/include/device/agp.h index e260caed9b9a..3184c10cee81 100644 --- a/include/device/agp.h +++ b/include/device/agp.h @@ -25,6 +25,6 @@ unsigned int agp_scan_bus(struct bus *bus, unsigned min_devfn, unsigned max_devfn, unsigned int max); unsigned int agp_scan_bridge(struct device *dev, unsigned int max); -extern struct device_operations default_agp_ops_bus; +extern const struct device_operations default_agp_ops_bus; #endif /* DEVICE_AGP_H */ |