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

« back to all changes in this revision

Viewing changes to drivers/watchdog/riowd.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:
172
172
        .fops   = &riowd_fops
173
173
};
174
174
 
175
 
static int __devinit riowd_probe(struct platform_device *op,
176
 
                                 const struct of_device_id *match)
 
175
static int __devinit riowd_probe(struct platform_device *op)
177
176
{
178
177
        struct riowd *p;
179
178
        int err = -EINVAL;
238
237
};
239
238
MODULE_DEVICE_TABLE(of, riowd_match);
240
239
 
241
 
static struct of_platform_driver riowd_driver = {
 
240
static struct platform_driver riowd_driver = {
242
241
        .driver = {
243
242
                .name = DRIVER_NAME,
244
243
                .owner = THIS_MODULE,
250
249
 
251
250
static int __init riowd_init(void)
252
251
{
253
 
        return of_register_platform_driver(&riowd_driver);
 
252
        return platform_driver_register(&riowd_driver);
254
253
}
255
254
 
256
255
static void __exit riowd_exit(void)
257
256
{
258
 
        of_unregister_platform_driver(&riowd_driver);
 
257
        platform_driver_unregister(&riowd_driver);
259
258
}
260
259
 
261
260
module_init(riowd_init);