diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-08-20 05:52:15 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-20 05:52:15 -0400 |
commit | 7393423dd9b5790a3115873be355e9fc862bce8f (patch) | |
tree | fc83214602c8ce41dc06d5c8e21deada679521f7 /drivers/input/serio | |
parent | 8df9676d6402563da91427e8d9f2da8a4598aede (diff) | |
parent | 1fca25427482387689fa27594c992a961d98768f (diff) |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'drivers/input/serio')
-rw-r--r-- | drivers/input/serio/i8042-sparcio.h | 3 | ||||
-rw-r--r-- | drivers/input/serio/i8042-x86ia64io.h | 7 | ||||
-rw-r--r-- | drivers/input/serio/xilinx_ps2.c | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h index 66bafe308b0c..692a79ec2a22 100644 --- a/drivers/input/serio/i8042-sparcio.h +++ b/drivers/input/serio/i8042-sparcio.h | |||
@@ -1,10 +1,11 @@ | |||
1 | #ifndef _I8042_SPARCIO_H | 1 | #ifndef _I8042_SPARCIO_H |
2 | #define _I8042_SPARCIO_H | 2 | #define _I8042_SPARCIO_H |
3 | 3 | ||
4 | #include <linux/of_device.h> | ||
5 | |||
4 | #include <asm/io.h> | 6 | #include <asm/io.h> |
5 | #include <asm/oplib.h> | 7 | #include <asm/oplib.h> |
6 | #include <asm/prom.h> | 8 | #include <asm/prom.h> |
7 | #include <asm/of_device.h> | ||
8 | 9 | ||
9 | static int i8042_kbd_irq = -1; | 10 | static int i8042_kbd_irq = -1; |
10 | static int i8042_aux_irq = -1; | 11 | static int i8042_aux_irq = -1; |
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index fe732a574ec2..3282b741e246 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h | |||
@@ -394,6 +394,13 @@ static struct dmi_system_id __initdata i8042_dmi_dritek_table[] = { | |||
394 | DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 2490"), | 394 | DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 2490"), |
395 | }, | 395 | }, |
396 | }, | 396 | }, |
397 | { | ||
398 | .ident = "Acer TravelMate 4280", | ||
399 | .matches = { | ||
400 | DMI_MATCH(DMI_SYS_VENDOR, "Acer"), | ||
401 | DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"), | ||
402 | }, | ||
403 | }, | ||
397 | { } | 404 | { } |
398 | }; | 405 | }; |
399 | 406 | ||
diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c index 0ed044d5e685..765007899d9a 100644 --- a/drivers/input/serio/xilinx_ps2.c +++ b/drivers/input/serio/xilinx_ps2.c | |||
@@ -269,8 +269,8 @@ static int xps2_setup(struct device *dev, struct resource *regs_res, | |||
269 | * we have the PS2 in a good state */ | 269 | * we have the PS2 in a good state */ |
270 | out_be32(drvdata->base_address + XPS2_SRST_OFFSET, XPS2_SRST_RESET); | 270 | out_be32(drvdata->base_address + XPS2_SRST_OFFSET, XPS2_SRST_RESET); |
271 | 271 | ||
272 | dev_info(dev, "Xilinx PS2 at 0x%08X mapped to 0x%08X, irq=%d\n", | 272 | dev_info(dev, "Xilinx PS2 at 0x%08X mapped to 0x%p, irq=%d\n", |
273 | drvdata->phys_addr, (u32)drvdata->base_address, drvdata->irq); | 273 | drvdata->phys_addr, drvdata->base_address, drvdata->irq); |
274 | 274 | ||
275 | serio = &drvdata->serio; | 275 | serio = &drvdata->serio; |
276 | serio->id.type = SERIO_8042; | 276 | serio->id.type = SERIO_8042; |