diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
| commit | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch) | |
| tree | 2624a44924c625c367f3cebf937853b9da2de282 /drivers/input/touchscreen/hp680_ts_input.c | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/input/touchscreen/hp680_ts_input.c')
| -rw-r--r-- | drivers/input/touchscreen/hp680_ts_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c index 957dd5a1b15e..fa97e0f79e7e 100644 --- a/drivers/input/touchscreen/hp680_ts_input.c +++ b/drivers/input/touchscreen/hp680_ts_input.c | |||
| @@ -109,7 +109,7 @@ static int __init hp680_ts_init(void) | |||
| 109 | input_register_device(hp680_ts_dev); | 109 | input_register_device(hp680_ts_dev); |
| 110 | 110 | ||
| 111 | if (request_irq(HP680_TS_IRQ, hp680_ts_interrupt, | 111 | if (request_irq(HP680_TS_IRQ, hp680_ts_interrupt, |
| 112 | SA_INTERRUPT, MODNAME, 0) < 0) { | 112 | IRQF_DISABLED, MODNAME, 0) < 0) { |
| 113 | printk(KERN_ERR "hp680_touchscreen.c: Can't allocate irq %d\n", | 113 | printk(KERN_ERR "hp680_touchscreen.c: Can't allocate irq %d\n", |
| 114 | HP680_TS_IRQ); | 114 | HP680_TS_IRQ); |
| 115 | input_unregister_device(hp680_ts_dev); | 115 | input_unregister_device(hp680_ts_dev); |