diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-03 02:57:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-03 02:57:59 -0500 |
| commit | 950f564b707ca1b1c5bb94cd1e7d2a0702bfcadc (patch) | |
| tree | 290cc32af2f8cfd232c57d491733592aed4dbf88 /drivers/ide/cmd640.c | |
| parent | b1681c56f5b6bf551bed2617a395855055836571 (diff) | |
| parent | 8495fb1b8d016657133c01a2f258c5f192d2a1b7 (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.c | 2 |
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) | |||
| 606 | } | 606 | } |
| 607 | #endif /* CONFIG_BLK_DEV_CMD640_ENHANCED */ | 607 | #endif /* CONFIG_BLK_DEV_CMD640_ENHANCED */ |
| 608 | 608 | ||
| 609 | static void cmd640_init_dev(ide_drive_t *drive) | 609 | static void __init cmd640_init_dev(ide_drive_t *drive) |
| 610 | { | 610 | { |
| 611 | unsigned int i = drive->hwif->channel * 2 + (drive->dn & 1); | 611 | unsigned int i = drive->hwif->channel * 2 + (drive->dn & 1); |
| 612 | 612 | ||