diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
commit | f5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch) | |
tree | 7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /drivers/ata/pata_it8213.c | |
parent | 9853832c49dc1685587abeb4e1decd4be690d256 (diff) | |
parent | 1560a79a2c2ea0c3826150da8029991d685de990 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits)
Jesper Juhl is the new trivial patches maintainer
Documentation: mention email-clients.txt in SubmittingPatches
fs/binfmt_elf.c: spello fix
do_invalidatepage() comment typo fix
Documentation/filesystems/porting fixes
typo fixes in net/core/net_namespace.c
typo fix in net/rfkill/rfkill.c
typo fixes in net/sctp/sm_statefuns.c
lib/: Spelling fixes
kernel/: Spelling fixes
include/scsi/: Spelling fixes
include/linux/: Spelling fixes
include/asm-m68knommu/: Spelling fixes
include/asm-frv/: Spelling fixes
fs/: Spelling fixes
drivers/watchdog/: Spelling fixes
drivers/video/: Spelling fixes
drivers/ssb/: Spelling fixes
drivers/serial/: Spelling fixes
drivers/scsi/: Spelling fixes
...
Diffstat (limited to 'drivers/ata/pata_it8213.c')
-rw-r--r-- | drivers/ata/pata_it8213.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_it8213.c b/drivers/ata/pata_it8213.c index 1eda821e5e39..e0c2cc29d0ca 100644 --- a/drivers/ata/pata_it8213.c +++ b/drivers/ata/pata_it8213.c | |||
@@ -128,7 +128,7 @@ static void it8213_set_piomode (struct ata_port *ap, struct ata_device *adev) | |||
128 | idetm_data &= 0xCC0F; | 128 | idetm_data &= 0xCC0F; |
129 | idetm_data |= (control << 4); | 129 | idetm_data |= (control << 4); |
130 | 130 | ||
131 | /* Slave timing in seperate register */ | 131 | /* Slave timing in separate register */ |
132 | pci_read_config_byte(dev, 0x44, &slave_data); | 132 | pci_read_config_byte(dev, 0x44, &slave_data); |
133 | slave_data &= 0xF0; | 133 | slave_data &= 0xF0; |
134 | slave_data |= ((timings[pio][0] << 2) | timings[pio][1]) << 4; | 134 | slave_data |= ((timings[pio][0] << 2) | timings[pio][1]) << 4; |