diff --git a/[refs] b/[refs]
index 60398249ce34..6419d7bcfc36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75255b29d473613e2a5737d6fb368dc4009c90a8
+refs/heads/master: e23ed600baf1df4819d5ba44240a3b7d555e6de2
diff --git a/trunk/drivers/input/touchscreen/htcpen.c b/trunk/drivers/input/touchscreen/htcpen.c
index 62811de6f18f..81e338623944 100644
--- a/trunk/drivers/input/touchscreen/htcpen.c
+++ b/trunk/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)
 {