Merge branch 'for-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata

e4ef108f · Linus Torvalds <[email protected]> · 2013-08-06 14:00:28 -07:00

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

Commit: e4ef108fcde0b97ed38923ba1ea06c7a152bab9e
Parents: 8e28921e · 71ab1d58

Merge commit. Changes below are compared with the first parent: 8e28921e.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
drivers/ata/pata_imx.c	modified	+1	−0	View file

drivers/ata/pata_imx.c

View file

diff --git a/drivers/ata/pata_imx.c b/drivers/ata/pata_imx.c
index 4ec7c04..26386f0 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[] = {
 		/* sentinel */
 	}
 };
+MODULE_DEVICE_TABLE(of, imx_pata_dt_ids);
 
 static struct platform_driver pata_imx_driver = {
 	.probe		= pata_imx_probe,