← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drivers/input/serio/i8042-sparcio.h

  • 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/input/serio/i8042-sparcio.h
49
49
#define OBP_PS2MS_NAME1         "kdmouse"
50
50
#define OBP_PS2MS_NAME2         "mouse"
51
51
 
52
 
static int __devinit sparc_i8042_probe(struct platform_device *op, const struct of_device_id *match)
 
52
static int __devinit sparc_i8042_probe(struct platform_device *op)
53
53
{
54
54
        struct device_node *dp = op->dev.of_node;
55
55
 
95
95
};
96
96
MODULE_DEVICE_TABLE(of, sparc_i8042_match);
97
97
 
98
 
static struct of_platform_driver sparc_i8042_driver = {
 
98
static struct platform_driver sparc_i8042_driver = {
99
99
        .driver = {
100
100
                .name = "i8042",
101
101
                .owner = THIS_MODULE,
116
116
                if (!kbd_iobase)
117
117
                        return -ENODEV;
118
118
        } else {
119
 
                int err = of_register_platform_driver(&sparc_i8042_driver);
 
119
                int err = platform_driver_register(&sparc_i8042_driver);
120
120
                if (err)
121
121
                        return err;
122
122
 
140
140
        struct device_node *root = of_find_node_by_path("/");
141
141
 
142
142
        if (strcmp(root->name, "SUNW,JavaStation-1"))
143
 
                of_unregister_platform_driver(&sparc_i8042_driver);
 
143
                platform_driver_unregister(&sparc_i8042_driver);
144
144
}
145
145
 
146
146
#else /* !CONFIG_PCI */