Merge branch 'master' of git://oak/home/sfr/kernels/iseries/work

[mv-sheeva.git] / drivers / input / touchscreen / hp680_ts_input.c

diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c
index 957dd5a1b15ea40bb3be850f891be11df438e500..ee6c2f40cdf6d6c5ca14603ace5e7d69a6e7029d 100644 (file)
--- a/drivers/input/touchscreen/hp680_ts_input.c
+++ b/drivers/input/touchscreen/hp680_ts_input.c
@@ -15,7 +15,6 @@
 #define HP680_TS_ABS_Y_MIN     80
 #define HP680_TS_ABS_Y_MAX     910
 
-#define        SCPCR   0xa4000116
 #define        PHDR    0xa400012e
 #define SCPDR  0xa4000136
 
@@ -77,19 +76,6 @@ static irqreturn_t hp680_ts_interrupt(int irq, void *dev, struct pt_regs *regs)
 
 static int __init hp680_ts_init(void)
 {
-       u8 scpdr;
-       u16 scpcr;
-
-       scpdr = ctrl_inb(SCPDR);
-       scpdr |= SCPDR_TS_SCAN_X | SCPDR_TS_SCAN_Y;
-       scpdr &= ~SCPDR_TS_SCAN_ENABLE;
-       ctrl_outb(scpdr, SCPDR);
-
-       scpcr = ctrl_inw(SCPCR);
-       scpcr &= ~SCPCR_TS_MASK;
-       scpcr |= SCPCR_TS_ENABLE;
-       ctrl_outw(scpcr, SCPCR);
-
        hp680_ts_dev = input_allocate_device();
        if (!hp680_ts_dev)
                return -ENOMEM;
@@ -109,7 +95,7 @@ static int __init hp680_ts_init(void)
        input_register_device(hp680_ts_dev);
 
        if (request_irq(HP680_TS_IRQ, hp680_ts_interrupt,
-                       SA_INTERRUPT, MODNAME, 0) < 0) {
+                       IRQF_DISABLED, MODNAME, 0) < 0) {
                printk(KERN_ERR "hp680_touchscreen.c: Can't allocate irq %d\n",
                       HP680_TS_IRQ);
                input_unregister_device(hp680_ts_dev);