aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/cy82c693.c2
-rw-r--r--drivers/ide/ide-floppy.c2
-rw-r--r--drivers/ide/ide-taskfile.c2
-rw-r--r--drivers/ide/piix.c4
-rw-r--r--drivers/ide/sis5513.c4
-rw-r--r--drivers/ide/triflex.c2
-rw-r--r--drivers/ide/via82cxxx.c2
7 files changed, 9 insertions, 9 deletions
diff --git a/drivers/ide/cy82c693.c b/drivers/ide/cy82c693.c
index 9383f67deae1..3be60da52123 100644
--- a/drivers/ide/cy82c693.c
+++ b/drivers/ide/cy82c693.c
@@ -67,7 +67,7 @@ static void cy82c693_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
67 67
68 /* 68 /*
69 * note: below we set the value for Bus Master IDE TimeOut Register 69 * note: below we set the value for Bus Master IDE TimeOut Register
70 * I'm not absolutly sure what this does, but it solved my problem 70 * I'm not absolutely sure what this does, but it solved my problem
71 * with IDE DMA and sound, so I now can play sound and work with 71 * with IDE DMA and sound, so I now can play sound and work with
72 * my IDE driver at the same time :-) 72 * my IDE driver at the same time :-)
73 * 73 *
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index 5406b6ea3ad1..5a702d02c848 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -107,7 +107,7 @@ static int ide_floppy_callback(ide_drive_t *drive, int dsc)
107static void ide_floppy_report_error(struct ide_disk_obj *floppy, 107static void ide_floppy_report_error(struct ide_disk_obj *floppy,
108 struct ide_atapi_pc *pc) 108 struct ide_atapi_pc *pc)
109{ 109{
110 /* supress error messages resulting from Medium not present */ 110 /* suppress error messages resulting from Medium not present */
111 if (floppy->sense_key == 0x02 && 111 if (floppy->sense_key == 0x02 &&
112 floppy->asc == 0x3a && 112 floppy->asc == 0x3a &&
113 floppy->ascq == 0x00) 113 floppy->ascq == 0x00)
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 34b9872f35d1..600c89a3d137 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -201,7 +201,7 @@ static u8 wait_drive_not_busy(ide_drive_t *drive)
201 u8 stat; 201 u8 stat;
202 202
203 /* 203 /*
204 * Last sector was transfered, wait until device is ready. This can 204 * Last sector was transferred, wait until device is ready. This can
205 * take up to 6 ms on some ATAPI devices, so we will wait max 10 ms. 205 * take up to 6 ms on some ATAPI devices, so we will wait max 10 ms.
206 */ 206 */
207 for (retries = 0; retries < 1000; retries++) { 207 for (retries = 0; retries < 1000; retries++) {
diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c
index 1bdca49e5a03..b59d04c72051 100644
--- a/drivers/ide/piix.c
+++ b/drivers/ide/piix.c
@@ -8,8 +8,8 @@
8 * 8 *
9 * Documentation: 9 * Documentation:
10 * 10 *
11 * Publically available from Intel web site. Errata documentation 11 * Publicly available from Intel web site. Errata documentation
12 * is also publically available. As an aide to anyone hacking on this 12 * is also publicly available. As an aide to anyone hacking on this
13 * driver the list of errata that are relevant is below.going back to 13 * driver the list of errata that are relevant is below.going back to
14 * PIIX4. Older device documentation is now a bit tricky to find. 14 * PIIX4. Older device documentation is now a bit tricky to find.
15 * 15 *
diff --git a/drivers/ide/sis5513.c b/drivers/ide/sis5513.c
index db7f4e761dbc..4a0022567758 100644
--- a/drivers/ide/sis5513.c
+++ b/drivers/ide/sis5513.c
@@ -53,7 +53,7 @@
53 53
54#define DRV_NAME "sis5513" 54#define DRV_NAME "sis5513"
55 55
56/* registers layout and init values are chipset family dependant */ 56/* registers layout and init values are chipset family dependent */
57 57
58#define ATA_16 0x01 58#define ATA_16 0x01
59#define ATA_33 0x02 59#define ATA_33 0x02
@@ -406,7 +406,7 @@ static int __devinit sis_find_family(struct pci_dev *dev)
406 pci_name(dev)); 406 pci_name(dev));
407 chipset_family = ATA_133; 407 chipset_family = ATA_133;
408 408
409 /* Check for 5513 compability mapping 409 /* Check for 5513 compatibility mapping
410 * We must use this, else the port enabled code will fail, 410 * We must use this, else the port enabled code will fail,
411 * as it expects the enablebits at 0x4a. 411 * as it expects the enablebits at 0x4a.
412 */ 412 */
diff --git a/drivers/ide/triflex.c b/drivers/ide/triflex.c
index 7953447eae0f..e53a1b78378b 100644
--- a/drivers/ide/triflex.c
+++ b/drivers/ide/triflex.c
@@ -22,7 +22,7 @@
22 * Loosely based on the piix & svwks drivers. 22 * Loosely based on the piix & svwks drivers.
23 * 23 *
24 * Documentation: 24 * Documentation:
25 * Not publically available. 25 * Not publicly available.
26 */ 26 */
27 27
28#include <linux/types.h> 28#include <linux/types.h>
diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c
index d2a0997b78f8..f46f49cfcc28 100644
--- a/drivers/ide/via82cxxx.c
+++ b/drivers/ide/via82cxxx.c
@@ -14,7 +14,7 @@
14 * Andre Hedrick 14 * Andre Hedrick
15 * 15 *
16 * Documentation: 16 * Documentation:
17 * Obsolete device documentation publically available from via.com.tw 17 * Obsolete device documentation publicly available from via.com.tw
18 * Current device documentation available under NDA only 18 * Current device documentation available under NDA only
19 */ 19 */
20 20