← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to drivers/usb/host/ohci-hcd.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/usb/host/ohci-hcd.c
1080
1080
#define PS3_SYSTEM_BUS_DRIVER   ps3_ohci_driver
1081
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
1083
#ifdef CONFIG_MFD_SM501
1089
1084
#include "ohci-sm501.c"
1090
1085
#define SM501_OHCI_DRIVER       ohci_hcd_sm501_driver
1128
1123
        !defined(SA1111_DRIVER) &&      \
1129
1124
        !defined(PS3_SYSTEM_BUS_DRIVER) && \
1130
1125
        !defined(SM501_OHCI_DRIVER) && \
1131
 
        !defined(TMIO_OHCI_DRIVER) && \
1132
 
        !defined(SSB_OHCI_DRIVER)
 
1126
        !defined(TMIO_OHCI_DRIVER)
1133
1127
#error "missing bus glue for ohci-hcd"
1134
1128
#endif
1135
1129
 
1195
1189
                goto error_pci;
1196
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
1192
#ifdef SM501_OHCI_DRIVER
1205
1193
        retval = platform_driver_register(&SM501_OHCI_DRIVER);
1206
1194
        if (retval < 0)
1224
1212
        platform_driver_unregister(&SM501_OHCI_DRIVER);
1225
1213
 error_sm501:
1226
1214
#endif
1227
 
#ifdef SSB_OHCI_DRIVER
1228
 
        ssb_driver_unregister(&SSB_OHCI_DRIVER);
1229
 
 error_ssb:
1230
 
#endif
1231
1215
#ifdef PCI_DRIVER
1232
1216
        pci_unregister_driver(&PCI_DRIVER);
1233
1217
 error_pci:
1275
1259
#ifdef SM501_OHCI_DRIVER
1276
1260
        platform_driver_unregister(&SM501_OHCI_DRIVER);
1277
1261
#endif
1278
 
#ifdef SSB_OHCI_DRIVER
1279
 
        ssb_driver_unregister(&SSB_OHCI_DRIVER);
1280
 
#endif
1281
1262
#ifdef PCI_DRIVER
1282
1263
        pci_unregister_driver(&PCI_DRIVER);
1283
1264
#endif