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

torvalds · torvalds · commit e4ef108fcde0 · 2013-08-06T14:00:28.000-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
diff --git 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,

Original file line number	Diff line number	Diff line change
`@@ -237,6 +237,7 @@ static const struct of_device_id imx_pata_dt_ids[] = {`
`237`	`237`	`/* sentinel */`
`238`	`238`	`}`
`239`	`239`	`};`
	`240`	`+MODULE_DEVICE_TABLE(of, imx_pata_dt_ids);`
`240`	`241`
`241`	`242`	`static struct platform_driver pata_imx_driver = {`
`242`	`243`	`.probe = pata_imx_probe,`