diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-12 13:11:43 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-12 13:11:43 +0900 |
| commit | b1bdd255661369cb6eb90b6e181169b5e6d0f9b6 (patch) | |
| tree | 17d15f3a6dc5bdd6205070dbef0e339421b13d25 /drivers/input/touchscreen/htcpen.c | |
| parent | 9d14070f656addddce3d63fd483de46930b51850 (diff) | |
| parent | c1537b4863da620f12f5b42ece61bf65314148ed (diff) | |
| download | linux-b1bdd255661369cb6eb90b6e181169b5e6d0f9b6.tar.bz2 | |
Merge branch 'sh/nommu' into sh-latest
Diffstat (limited to 'drivers/input/touchscreen/htcpen.c')
| -rw-r--r-- | drivers/input/touchscreen/htcpen.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/input/touchscreen/htcpen.c b/drivers/input/touchscreen/htcpen.c index 62811de6f18f..81e338623944 100644 --- a/drivers/input/touchscreen/htcpen.c +++ b/drivers/input/touchscreen/htcpen.c @@ -47,12 +47,6 @@ static int invert_y; module_param(invert_y, bool, 0644); MODULE_PARM_DESC(invert_y, "If set, Y axis is inverted"); -static struct pnp_device_id pnp_ids[] = { - { .id = "PNP0cc0" }, - { .id = "" } -}; -MODULE_DEVICE_TABLE(pnp, pnp_ids); - static irqreturn_t htcpen_interrupt(int irq, void *handle) { struct input_dev *htcpen_dev = handle; @@ -237,6 +231,7 @@ static struct dmi_system_id __initdata htcshift_dmi_table[] = { }, { } }; +MODULE_DEVICE_TABLE(dmi, htcshift_dmi_table); static int __init htcpen_isa_init(void) { |