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/char | |
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/char')
-rw-r--r-- | drivers/char/hw_random/nomadik-rng.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/hw_random/nomadik-rng.c b/drivers/char/hw_random/nomadik-rng.c index 52e08ca3ccd7..3d3c1e6703b4 100644 --- a/drivers/char/hw_random/nomadik-rng.c +++ b/drivers/char/hw_random/nomadik-rng.c | |||
@@ -95,6 +95,8 @@ static struct amba_id nmk_rng_ids[] = { | |||
95 | {0, 0}, | 95 | {0, 0}, |
96 | }; | 96 | }; |
97 | 97 | ||
98 | MODULE_DEVICE_TABLE(amba, nmk_rng_ids); | ||
99 | |||
98 | static struct amba_driver nmk_rng_driver = { | 100 | static struct amba_driver nmk_rng_driver = { |
99 | .drv = { | 101 | .drv = { |
100 | .owner = THIS_MODULE, | 102 | .owner = THIS_MODULE, |