diff options
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/keyboard/amikbd.c | 2 | ||||
| -rw-r--r-- | drivers/input/misc/sparcspkr.c | 2 | 
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/input/keyboard/amikbd.c b/drivers/input/keyboard/amikbd.c index 3d63bc1ad322..4c8fb1f8631f 100644 --- a/drivers/input/keyboard/amikbd.c +++ b/drivers/input/keyboard/amikbd.c  | |||
| @@ -199,7 +199,7 @@ static int __init amikbd_init(void) | |||
| 199 | if (!request_mem_region(CIAA_PHYSADDR-1+0xb00, 0x100, "amikeyb")) | 199 | if (!request_mem_region(CIAA_PHYSADDR-1+0xb00, 0x100, "amikeyb")) | 
| 200 | return -EBUSY; | 200 | return -EBUSY; | 
| 201 | 201 | ||
| 202 | amikbd_dev = input_dev_allocate(); | 202 | amikbd_dev = input_allocate_device(); | 
| 203 | if (!amikbd_dev) { | 203 | if (!amikbd_dev) { | 
| 204 | printk(KERN_ERR "amikbd: not enough memory for input device\n"); | 204 | printk(KERN_ERR "amikbd: not enough memory for input device\n"); | 
| 205 | release_mem_region(CIAA_PHYSADDR - 1 + 0xb00, 0x100); | 205 | release_mem_region(CIAA_PHYSADDR - 1 + 0xb00, 0x100); | 
diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c index 5778220a18d2..29d97b12be7a 100644 --- a/drivers/input/misc/sparcspkr.c +++ b/drivers/input/misc/sparcspkr.c  | |||
| @@ -143,7 +143,7 @@ static int __init init_isa_beep(struct sparc_isa_device *isa_dev) | |||
| 143 | sparcspkr_dev->name = "Sparc ISA Speaker"; | 143 | sparcspkr_dev->name = "Sparc ISA Speaker"; | 
| 144 | sparcspkr_dev->event = isa_spkr_event; | 144 | sparcspkr_dev->event = isa_spkr_event; | 
| 145 | 145 | ||
| 146 | input_register_device(&sparcspkr_dev); | 146 | input_register_device(sparcspkr_dev); | 
| 147 | 147 | ||
| 148 | return 0; | 148 | return 0; | 
| 149 | } | 149 | } | 
