diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-06 17:00:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-06 17:00:28 -0400 |
| commit | e4ef108fcde0b97ed38923ba1ea06c7a152bab9e (patch) | |
| tree | 628062eeaa08c0f91c108734d430126f1a63adee | |
| parent | 8e28921e5e3c1760167faad53bcdb6cfa1aa0806 (diff) | |
| parent | 71ab1d58c26eb7c30711caa95c173d5c39ab8855 (diff) | |
Merge branch 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
Pull libata fix from Tejun Heo:
"Just the addition of MODULE_DEVICE_TABLE() for a platform driver"
* 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
pata_imx: expose module alias for loading from device-tree
| -rw-r--r-- | drivers/ata/pata_imx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/ata/pata_imx.c b/drivers/ata/pata_imx.c index 4ec7c04b3f82..26386f0b89a8 100644 --- a/drivers/ata/pata_imx.c +++ b/drivers/ata/pata_imx.c | |||
| @@ -237,6 +237,7 @@ static const struct of_device_id imx_pata_dt_ids[] = { | |||
| 237 | /* sentinel */ | 237 | /* sentinel */ |
| 238 | } | 238 | } |
| 239 | }; | 239 | }; |
| 240 | MODULE_DEVICE_TABLE(of, imx_pata_dt_ids); | ||
| 240 | 241 | ||
| 241 | static struct platform_driver pata_imx_driver = { | 242 | static struct platform_driver pata_imx_driver = { |
| 242 | .probe = pata_imx_probe, | 243 | .probe = pata_imx_probe, |