diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-04 07:52:14 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-04 07:52:14 (GMT) |
| commit | cb9c34e6d090d376b77becaa5d29a65dec7f4272 (patch) | |
| tree | 3678abce20d6825aebe3fec218057d4131e13fd6 /drivers/input/xen-kbdfront.c | |
| parent | 470c66239ef0336429b35345f3f615d47341e13b (diff) | |
| parent | 061e41fdb5047b1fb161e89664057835935ca1d2 (diff) | |
| download | linux-fsl-qoriq-cb9c34e6d090d376b77becaa5d29a65dec7f4272.tar.xz | |
Merge commit 'v2.6.28-rc7' into core/locking
Diffstat (limited to 'drivers/input/xen-kbdfront.c')
| -rw-r--r-- | drivers/input/xen-kbdfront.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/xen-kbdfront.c b/drivers/input/xen-kbdfront.c index 3ab6362..928d2ed 100644 --- a/drivers/input/xen-kbdfront.c +++ b/drivers/input/xen-kbdfront.c @@ -323,7 +323,7 @@ static struct xenbus_device_id xenkbd_ids[] = { { "" } }; -static struct xenbus_driver xenkbd = { +static struct xenbus_driver xenkbd_driver = { .name = "vkbd", .owner = THIS_MODULE, .ids = xenkbd_ids, @@ -342,12 +342,12 @@ static int __init xenkbd_init(void) if (xen_initial_domain()) return -ENODEV; - return xenbus_register_frontend(&xenkbd); + return xenbus_register_frontend(&xenkbd_driver); } static void __exit xenkbd_cleanup(void) { - xenbus_unregister_driver(&xenkbd); + xenbus_unregister_driver(&xenkbd_driver); } module_init(xenkbd_init); |