← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/pcmcia/m8xx_pcmcia.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/pcmcia/m8xx_pcmcia.c
1148
1148
        .set_mem_map = m8xx_set_mem_map,
1149
1149
};
1150
1150
 
1151
 
static int __init m8xx_probe(struct platform_device *ofdev,
1152
 
                             const struct of_device_id *match)
 
1151
static int __init m8xx_probe(struct platform_device *ofdev)
1153
1152
{
1154
1153
        struct pcmcia_win *w;
1155
1154
        unsigned int i, m, hwirq;
1295
1294
 
1296
1295
MODULE_DEVICE_TABLE(of, m8xx_pcmcia_match);
1297
1296
 
1298
 
static struct of_platform_driver m8xx_pcmcia_driver = {
 
1297
static struct platform_driver m8xx_pcmcia_driver = {
1299
1298
        .driver = {
1300
1299
                .name = driver_name,
1301
1300
                .owner = THIS_MODULE,
1307
1306
 
1308
1307
static int __init m8xx_init(void)
1309
1308
{
1310
 
        return of_register_platform_driver(&m8xx_pcmcia_driver);
 
1309
        return platform_driver_register(&m8xx_pcmcia_driver);
1311
1310
}
1312
1311
 
1313
1312
static void __exit m8xx_exit(void)
1314
1313
{
1315
 
        of_unregister_platform_driver(&m8xx_pcmcia_driver);
 
1314
        platform_driver_unregister(&m8xx_pcmcia_driver);
1316
1315
}
1317
1316
 
1318
1317
module_init(m8xx_init);