diff options
Diffstat (limited to 'drivers/usb/host/ohci-hcd.c')
-rw-r--r-- | drivers/usb/host/ohci-hcd.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c index 235171f29460..e0adf5c0cf55 100644 --- a/drivers/usb/host/ohci-hcd.c +++ b/drivers/usb/host/ohci-hcd.c | |||
@@ -1080,11 +1080,6 @@ MODULE_LICENSE ("GPL"); | |||
1080 | #define PS3_SYSTEM_BUS_DRIVER ps3_ohci_driver | 1080 | #define PS3_SYSTEM_BUS_DRIVER ps3_ohci_driver |
1081 | #endif | 1081 | #endif |
1082 | 1082 | ||
1083 | #ifdef CONFIG_USB_OHCI_HCD_SSB | ||
1084 | #include "ohci-ssb.c" | ||
1085 | #define SSB_OHCI_DRIVER ssb_ohci_driver | ||
1086 | #endif | ||
1087 | |||
1088 | #ifdef CONFIG_MFD_SM501 | 1083 | #ifdef CONFIG_MFD_SM501 |
1089 | #include "ohci-sm501.c" | 1084 | #include "ohci-sm501.c" |
1090 | #define SM501_OHCI_DRIVER ohci_hcd_sm501_driver | 1085 | #define SM501_OHCI_DRIVER ohci_hcd_sm501_driver |
@@ -1128,8 +1123,7 @@ MODULE_LICENSE ("GPL"); | |||
1128 | !defined(SA1111_DRIVER) && \ | 1123 | !defined(SA1111_DRIVER) && \ |
1129 | !defined(PS3_SYSTEM_BUS_DRIVER) && \ | 1124 | !defined(PS3_SYSTEM_BUS_DRIVER) && \ |
1130 | !defined(SM501_OHCI_DRIVER) && \ | 1125 | !defined(SM501_OHCI_DRIVER) && \ |
1131 | !defined(TMIO_OHCI_DRIVER) && \ | 1126 | !defined(TMIO_OHCI_DRIVER) |
1132 | !defined(SSB_OHCI_DRIVER) | ||
1133 | #error "missing bus glue for ohci-hcd" | 1127 | #error "missing bus glue for ohci-hcd" |
1134 | #endif | 1128 | #endif |
1135 | 1129 | ||
@@ -1195,12 +1189,6 @@ static int __init ohci_hcd_mod_init(void) | |||
1195 | goto error_pci; | 1189 | goto error_pci; |
1196 | #endif | 1190 | #endif |
1197 | 1191 | ||
1198 | #ifdef SSB_OHCI_DRIVER | ||
1199 | retval = ssb_driver_register(&SSB_OHCI_DRIVER); | ||
1200 | if (retval) | ||
1201 | goto error_ssb; | ||
1202 | #endif | ||
1203 | |||
1204 | #ifdef SM501_OHCI_DRIVER | 1192 | #ifdef SM501_OHCI_DRIVER |
1205 | retval = platform_driver_register(&SM501_OHCI_DRIVER); | 1193 | retval = platform_driver_register(&SM501_OHCI_DRIVER); |
1206 | if (retval < 0) | 1194 | if (retval < 0) |
@@ -1224,10 +1212,6 @@ static int __init ohci_hcd_mod_init(void) | |||
1224 | platform_driver_unregister(&SM501_OHCI_DRIVER); | 1212 | platform_driver_unregister(&SM501_OHCI_DRIVER); |
1225 | error_sm501: | 1213 | error_sm501: |
1226 | #endif | 1214 | #endif |
1227 | #ifdef SSB_OHCI_DRIVER | ||
1228 | ssb_driver_unregister(&SSB_OHCI_DRIVER); | ||
1229 | error_ssb: | ||
1230 | #endif | ||
1231 | #ifdef PCI_DRIVER | 1215 | #ifdef PCI_DRIVER |
1232 | pci_unregister_driver(&PCI_DRIVER); | 1216 | pci_unregister_driver(&PCI_DRIVER); |
1233 | error_pci: | 1217 | error_pci: |
@@ -1275,9 +1259,6 @@ static void __exit ohci_hcd_mod_exit(void) | |||
1275 | #ifdef SM501_OHCI_DRIVER | 1259 | #ifdef SM501_OHCI_DRIVER |
1276 | platform_driver_unregister(&SM501_OHCI_DRIVER); | 1260 | platform_driver_unregister(&SM501_OHCI_DRIVER); |
1277 | #endif | 1261 | #endif |
1278 | #ifdef SSB_OHCI_DRIVER | ||
1279 | ssb_driver_unregister(&SSB_OHCI_DRIVER); | ||
1280 | #endif | ||
1281 | #ifdef PCI_DRIVER | 1262 | #ifdef PCI_DRIVER |
1282 | pci_unregister_driver(&PCI_DRIVER); | 1263 | pci_unregister_driver(&PCI_DRIVER); |
1283 | #endif | 1264 | #endif |