diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-19 06:49:35 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-19 06:49:35 -0500 |
| commit | 9e18e1869f5ebac69f0d881fe97a198ebc0834db (patch) | |
| tree | 18c5b5c185d39cbb50fa652b5e08d047c8cf06e1 /drivers/ata/pata_legacy.c | |
| parent | 04af964f9cb666caa7c1436d003f8fac0f1fedcc (diff) | |
| parent | 460ed699f4c943e1ec4a8458869eb532fe31fd16 (diff) | |
Merge branch 'next-samsung-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into for-2.6.38
Diffstat (limited to 'drivers/ata/pata_legacy.c')
| -rw-r--r-- | drivers/ata/pata_legacy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c index eaf194138f21..6bd9425ba5ab 100644 --- a/drivers/ata/pata_legacy.c +++ b/drivers/ata/pata_legacy.c | |||
| @@ -142,7 +142,7 @@ static int autospeed; /* Chip present which snoops speed changes */ | |||
| 142 | static int pio_mask = ATA_PIO4; /* PIO range for autospeed devices */ | 142 | static int pio_mask = ATA_PIO4; /* PIO range for autospeed devices */ |
| 143 | static int iordy_mask = 0xFFFFFFFF; /* Use iordy if available */ | 143 | static int iordy_mask = 0xFFFFFFFF; /* Use iordy if available */ |
| 144 | 144 | ||
| 145 | #ifdef PATA_WINBOND_VLB_MODULE | 145 | #ifdef CONFIG_PATA_WINBOND_VLB_MODULE |
| 146 | static int winbond = 1; /* Set to probe Winbond controllers, | 146 | static int winbond = 1; /* Set to probe Winbond controllers, |
| 147 | give I/O port if non standard */ | 147 | give I/O port if non standard */ |
| 148 | #else | 148 | #else |