Merge commit 'v2.6.35-rc1' into amd-iommu/2.6.35

[pandora-kernel.git] / drivers / input / serio / i8042-x86ia64io.h

diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index ead0494..6168469 100644 (file)
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -660,8 +660,21 @@ static int i8042_pnp_aux_probe(struct pnp_dev *dev, const struct pnp_device_id *
 }
 
 static struct pnp_device_id pnp_kbd_devids[] = {
+       { .id = "PNP0300", .driver_data = 0 },
+       { .id = "PNP0301", .driver_data = 0 },
+       { .id = "PNP0302", .driver_data = 0 },
        { .id = "PNP0303", .driver_data = 0 },
+       { .id = "PNP0304", .driver_data = 0 },
+       { .id = "PNP0305", .driver_data = 0 },
+       { .id = "PNP0306", .driver_data = 0 },
+       { .id = "PNP0309", .driver_data = 0 },
+       { .id = "PNP030a", .driver_data = 0 },
        { .id = "PNP030b", .driver_data = 0 },
+       { .id = "PNP0320", .driver_data = 0 },
+       { .id = "PNP0343", .driver_data = 0 },
+       { .id = "PNP0344", .driver_data = 0 },
+       { .id = "PNP0345", .driver_data = 0 },
+       { .id = "CPQA0D7", .driver_data = 0 },
        { .id = "", },
 };
 
@@ -672,6 +685,7 @@ static struct pnp_driver i8042_pnp_kbd_driver = {
 };
 
 static struct pnp_device_id pnp_aux_devids[] = {
+       { .id = "AUI0200", .driver_data = 0 },
        { .id = "FJC6000", .driver_data = 0 },
        { .id = "FJC6001", .driver_data = 0 },
        { .id = "PNP0f03", .driver_data = 0 },