summaryrefslogtreecommitdiffstats
path: root/drivers/ide/jmicron.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-01-19 16:27:30 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-01-19 16:27:30 +0100
commit210b1847b32951f52d19df229972399e5b987de2 (patch)
treebe6eeb3ba76b4f4331c98d5ba47aa233bea8f22d /drivers/ide/jmicron.c
parentARM: 7629/1: mm: Fix missing XN flag for for MT_MEMORY_SO (diff)
parentARM: virt: simplify __hyp_stub_install epilog (diff)
downloadlinux-210b1847b32951f52d19df229972399e5b987de2.tar.xz
linux-210b1847b32951f52d19df229972399e5b987de2.zip
Merge branch 'for-rmk/virt/hyp-boot/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into fixes
Diffstat (limited to 'drivers/ide/jmicron.c')
-rw-r--r--drivers/ide/jmicron.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/jmicron.c b/drivers/ide/jmicron.c
index efddd7d9f92d..ae6480dcbadf 100644
--- a/drivers/ide/jmicron.c
+++ b/drivers/ide/jmicron.c
@@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron_port_ops = {
.cable_detect = jmicron_cable_detect,
};
-static const struct ide_port_info jmicron_chipset __devinitconst = {
+static const struct ide_port_info jmicron_chipset = {
.name = DRV_NAME,
.enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } },
.port_ops = &jmicron_port_ops,
@@ -120,7 +120,7 @@ static const struct ide_port_info jmicron_chipset __devinitconst = {
* We then use the IDE PCI generic helper to do most of the work.
*/
-static int __devinit jmicron_init_one(struct pci_dev *dev, const struct pci_device_id *id)
+static int jmicron_init_one(struct pci_dev *dev, const struct pci_device_id *id)
{
return ide_pci_init_one(dev, &jmicron_chipset, NULL);
}