diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 21:03:30 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-06 21:03:30 -0500 |
commit | d3d0b024348c040f0d6851e2e59fc961677d5169 (patch) | |
tree | ab018edaa027ad069c54beb9cb3d0c5b5efc2198 /drivers/input/serio | |
parent | 6ed23fd6c08b3ffa17c1f841098d2fa2ab3a59dd (diff) | |
parent | 9d5c627323dcf0983d699d26dd486272fc98bef2 (diff) |
Merge branch 'amba-modalias' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
* 'amba-modalias' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
sound: aaci: Enable module alias autogeneration for AMBA drivers
watchdog: sp805: Enable module alias autogeneration for AMBA drivers
fbdev: amba: Enable module alias autogeneration for AMBA drivers
serial: pl011: Enable module alias autogeneration for AMBA drivers
serial: pl010: Enable module alias autogeneration for AMBA drivers
spi: pl022: Enable module alias autogeneration for AMBA drivers
rtc: pl031: Enable module alias autogeneration for AMBA drivers
rtc: pl030: Enable module alias autogeneration for AMBA drivers
mmc: mmci: Enable module alias autogeneration for AMBA drivers
input: ambakmi: Enable module alias autogeneration for AMBA drivers
gpio: pl061: Enable module alias autogeneration for AMBA drivers
dmaengine: pl330: Enable module alias autogeneration for AMBA drivers
dmaengine: pl08x: Enable module alias autogeneration for AMBA drivers
hwrng: nomadik: Enable module alias autogeneration for AMBA drivers
ARM: amba: Auto-generate AMBA driver module aliases during modpost
ARM: amba: Move definition of struct amba_id to mod_devicetable.h
Diffstat (limited to 'drivers/input/serio')
-rw-r--r-- | drivers/input/serio/ambakmi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c index 12abc50508e5..8407d5b0ced8 100644 --- a/drivers/input/serio/ambakmi.c +++ b/drivers/input/serio/ambakmi.c | |||
@@ -195,6 +195,8 @@ static struct amba_id amba_kmi_idtable[] = { | |||
195 | { 0, 0 } | 195 | { 0, 0 } |
196 | }; | 196 | }; |
197 | 197 | ||
198 | MODULE_DEVICE_TABLE(amba, amba_kmi_idtable); | ||
199 | |||
198 | static struct amba_driver ambakmi_driver = { | 200 | static struct amba_driver ambakmi_driver = { |
199 | .drv = { | 201 | .drv = { |
200 | .name = "kmi-pl050", | 202 | .name = "kmi-pl050", |