diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-19 05:40:33 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-19 05:40:33 +0200 |
commit | 5bc0b123dcb2bb65b0b1ec57e591459dcf583d3d (patch) | |
tree | 6ee79d18fd716755d49d18c465c1b25fabc43597 /drivers/ata/pata_imx.c | |
parent | drivers/misc/hpilo: Correct panic when an AUX iLO is detected (diff) | |
parent | Linux 3.11-rc6 (diff) | |
download | linux-5bc0b123dcb2bb65b0b1ec57e591459dcf583d3d.tar.xz linux-5bc0b123dcb2bb65b0b1ec57e591459dcf583d3d.zip |
Merge 3.11-rc6 into char-misc-next
We want these fixes in this tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/ata/pata_imx.c')
-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[] = { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, imx_pata_dt_ids); static struct platform_driver pata_imx_driver = { .probe = pata_imx_probe, |