summaryrefslogtreecommitdiff
path: root/drivers/ide/cmd640.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-03-02 23:57:59 -0800
committerDavid S. Miller <davem@davemloft.net>2010-03-02 23:57:59 -0800
commit950f564b707ca1b1c5bb94cd1e7d2a0702bfcadc (patch)
tree290cc32af2f8cfd232c57d491733592aed4dbf88 /drivers/ide/cmd640.c
parentb1681c56f5b6bf551bed2617a395855055836571 (diff)
parent8495fb1b8d016657133c01a2f258c5f192d2a1b7 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ide-2.6
Diffstat (limited to 'drivers/ide/cmd640.c')
-rw-r--r--drivers/ide/cmd640.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/cmd640.c b/drivers/ide/cmd640.c
index c7d46a3d347a..d2b8b272bc27 100644
--- a/drivers/ide/cmd640.c
+++ b/drivers/ide/cmd640.c
@@ -606,7 +606,7 @@ static void cmd640_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
}
#endif /* CONFIG_BLK_DEV_CMD640_ENHANCED */
-static void cmd640_init_dev(ide_drive_t *drive)
+static void __init cmd640_init_dev(ide_drive_t *drive)
{
unsigned int i = drive->hwif->channel * 2 + (drive->dn & 1);