aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 23:36:17 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 23:36:17 -0400
commitc00046c279a2521075250fad682ca0acc10d4fd7 (patch)
tree78a7e9089c26f199ad9b0161bb564b7c1ca6daf9 /drivers/ide
parent9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5 (diff)
parent8e8a1407ac23b43cec0412338c1b4f5e1c664550 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits) fix do_sys_open() prototype sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake Documentation: Fix typo in SubmitChecklist. Typo: depricated -> deprecated Add missing profile=kvm option to Documentation/kernel-parameters.txt fix typo about TBI in e1000 comment proc.txt: Add /proc/stat field small documentation fixes Fix compiler warning in smount example program from sharedsubtree.txt docs/sysfs: add missing word to sysfs attribute explanation documentation/ext3: grammar fixes Documentation/java.txt: typo and grammar fixes Documentation/filesystems/vfs.txt: typo fix include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros trivial copy_data_pages() tidy up Fix typo in arch/x86/kernel/tsc_32.c file link fix for Pegasus USB net driver help remove unused return within void return function Typo fixes retrun -> return x86 hpet.h: remove broken links ...
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-cd.c6
-rw-r--r--drivers/ide/ide-tape.c2
-rw-r--r--drivers/ide/legacy/q40ide.c2
-rw-r--r--drivers/ide/pci/it821x.c4
-rw-r--r--drivers/ide/pci/siimage.c2
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index ca843522f91d..57a5f63d6ae3 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -120,7 +120,7 @@
120 * Reformat to match kernel tabbing style. 120 * Reformat to match kernel tabbing style.
121 * Add CDROM_GET_UPC ioctl. 121 * Add CDROM_GET_UPC ioctl.
122 * 3.10 Apr 10, 1996 -- Fix compilation error with STANDARD_ATAPI. 122 * 3.10 Apr 10, 1996 -- Fix compilation error with STANDARD_ATAPI.
123 * 3.11 Apr 29, 1996 -- Patch from Heiko Eissfeldt <heiko@colossus.escape.de> 123 * 3.11 Apr 29, 1996 -- Patch from Heiko Eißfeldt <heiko@colossus.escape.de>
124 * to remove redundant verify_area calls. 124 * to remove redundant verify_area calls.
125 * 3.12 May 7, 1996 -- Rudimentary changer support. Based on patches 125 * 3.12 May 7, 1996 -- Rudimentary changer support. Based on patches
126 * from Gerhard Zuber <zuber@berlin.snafu.de>. 126 * from Gerhard Zuber <zuber@berlin.snafu.de>.
@@ -256,7 +256,7 @@
256 * - Minimize the TOC reading - only do it when we 256 * - Minimize the TOC reading - only do it when we
257 * know a media change has occurred. 257 * know a media change has occurred.
258 * - Moved all the CDROMREADx ioctls to the Uniform layer. 258 * - Moved all the CDROMREADx ioctls to the Uniform layer.
259 * - Heiko Eissfeldt <heiko@colossus.escape.de> supplied 259 * - Heiko Eißfeldt <heiko@colossus.escape.de> supplied
260 * some fixes for CDI. 260 * some fixes for CDI.
261 * - CD-ROM leaving door locked fix from Andries 261 * - CD-ROM leaving door locked fix from Andries
262 * Brouwer <Andries.Brouwer@cwi.nl> 262 * Brouwer <Andries.Brouwer@cwi.nl>
@@ -2341,7 +2341,7 @@ static int cdrom_read_toc(ide_drive_t *drive, struct request_sense *sense)
2341 If we get an error for the regular case, we assume 2341 If we get an error for the regular case, we assume
2342 a CDI without additional audio tracks. In this case 2342 a CDI without additional audio tracks. In this case
2343 the readable TOC is empty (CDI tracks are not included) 2343 the readable TOC is empty (CDI tracks are not included)
2344 and only holds the Leadout entry. Heiko Eißfeldt */ 2344 and only holds the Leadout entry. Heiko Eißfeldt */
2345 ntracks = 0; 2345 ntracks = 0;
2346 stat = cdrom_read_tocentry(drive, CDROM_LEADOUT, 1, 0, 2346 stat = cdrom_read_tocentry(drive, CDROM_LEADOUT, 1, 0,
2347 (char *)&toc->hdr, 2347 (char *)&toc->hdr,
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c
index e5a86a962b26..7b9181b5469d 100644
--- a/drivers/ide/ide-tape.c
+++ b/drivers/ide/ide-tape.c
@@ -565,7 +565,7 @@ typedef struct os_dat_s {
565 * The following parameter is used to select the point in the internal 565 * The following parameter is used to select the point in the internal
566 * tape fifo in which we will start to refill the buffer. Decreasing 566 * tape fifo in which we will start to refill the buffer. Decreasing
567 * the following parameter will improve the system's latency and 567 * the following parameter will improve the system's latency and
568 * interactive response, while using a high value might improve sytem 568 * interactive response, while using a high value might improve system
569 * throughput. 569 * throughput.
570 */ 570 */
571#define IDETAPE_FIFO_THRESHOLD 2 571#define IDETAPE_FIFO_THRESHOLD 2
diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index 44cdb745a6ff..a73db1bd482d 100644
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -101,7 +101,7 @@ void q40_ide_setup_ports ( hw_regs_t *hw,
101 101
102/* 102/*
103 * the static array is needed to have the name reported in /proc/ioports, 103 * the static array is needed to have the name reported in /proc/ioports,
104 * hwif->name unfortunately isn´t available yet 104 * hwif->name unfortunately isn't available yet
105 */ 105 */
106static const char *q40_ide_names[Q40IDE_NUM_HWIFS]={ 106static const char *q40_ide_names[Q40IDE_NUM_HWIFS]={
107 "ide0", "ide1" 107 "ide0", "ide1"
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index 1a7ddd12e65c..5c9975435319 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -95,7 +95,7 @@ struct it821x_dev
95 95
96/* 96/*
97 * We allow users to force the card into non raid mode without 97 * We allow users to force the card into non raid mode without
98 * flashing the alternative BIOS. This is also neccessary right now 98 * flashing the alternative BIOS. This is also necessary right now
99 * for embedded platforms that cannot run a PC BIOS but are using this 99 * for embedded platforms that cannot run a PC BIOS but are using this
100 * device. 100 * device.
101 */ 101 */
@@ -564,7 +564,7 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif)
564 564
565 /* 565 /*
566 * Not in the docs but according to the reference driver 566 * Not in the docs but according to the reference driver
567 * this is neccessary. 567 * this is necessary.
568 */ 568 */
569 569
570 pci_read_config_byte(hwif->pci_dev, 0x08, &conf); 570 pci_read_config_byte(hwif->pci_dev, 0x08, &conf);
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index dc915cb22bec..6d99441c605b 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -26,7 +26,7 @@
26 * 26 *
27 * If you have strange problems with nVidia chipset systems please 27 * If you have strange problems with nVidia chipset systems please
28 * see the SI support documentation and update your system BIOS 28 * see the SI support documentation and update your system BIOS
29 * if neccessary 29 * if necessary
30 * 30 *
31 * The Dell DRAC4 has some interesting features including effectively hot 31 * The Dell DRAC4 has some interesting features including effectively hot
32 * unplugging/replugging the virtual CD interface when the DRAC is reset. 32 * unplugging/replugging the virtual CD interface when the DRAC is reset.