diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-28 08:29:59 -0400 |
| commit | 185a257f2f73bcd89050ad02da5bedbc28fc43fa (patch) | |
| tree | 5e32586114534ed3f2165614cba3d578f5d87307 /drivers/input | |
| parent | 3f1a9aaeffd8d1cbc5ab9776c45cbd66af1c9699 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into gfs2
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/touchscreen/hp680_ts_input.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/input/touchscreen/hp680_ts_input.c b/drivers/input/touchscreen/hp680_ts_input.c index fa97e0f79e7e..ee6c2f40cdf6 100644 --- a/drivers/input/touchscreen/hp680_ts_input.c +++ b/drivers/input/touchscreen/hp680_ts_input.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #define HP680_TS_ABS_Y_MIN 80 | 15 | #define HP680_TS_ABS_Y_MIN 80 |
| 16 | #define HP680_TS_ABS_Y_MAX 910 | 16 | #define HP680_TS_ABS_Y_MAX 910 |
| 17 | 17 | ||
| 18 | #define SCPCR 0xa4000116 | ||
| 19 | #define PHDR 0xa400012e | 18 | #define PHDR 0xa400012e |
| 20 | #define SCPDR 0xa4000136 | 19 | #define SCPDR 0xa4000136 |
| 21 | 20 | ||
| @@ -77,19 +76,6 @@ static irqreturn_t hp680_ts_interrupt(int irq, void *dev, struct pt_regs *regs) | |||
| 77 | 76 | ||
| 78 | static int __init hp680_ts_init(void) | 77 | static int __init hp680_ts_init(void) |
| 79 | { | 78 | { |
| 80 | u8 scpdr; | ||
| 81 | u16 scpcr; | ||
| 82 | |||
| 83 | scpdr = ctrl_inb(SCPDR); | ||
| 84 | scpdr |= SCPDR_TS_SCAN_X | SCPDR_TS_SCAN_Y; | ||
| 85 | scpdr &= ~SCPDR_TS_SCAN_ENABLE; | ||
| 86 | ctrl_outb(scpdr, SCPDR); | ||
| 87 | |||
| 88 | scpcr = ctrl_inw(SCPCR); | ||
| 89 | scpcr &= ~SCPCR_TS_MASK; | ||
| 90 | scpcr |= SCPCR_TS_ENABLE; | ||
| 91 | ctrl_outw(scpcr, SCPCR); | ||
| 92 | |||
| 93 | hp680_ts_dev = input_allocate_device(); | 79 | hp680_ts_dev = input_allocate_device(); |
| 94 | if (!hp680_ts_dev) | 80 | if (!hp680_ts_dev) |
| 95 | return -ENOMEM; | 81 | return -ENOMEM; |