aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 13:05:56 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 13:05:56 -0500
commit008d23e4852d78bb2618f2035f8b2110b6a6b968 (patch)
tree81c88f744f6f3fc84132527c1ddc0b4da410c5e2 /drivers/ata
parent8f685fbda43deccd130d192c9fcef1444649eaca (diff)
parentbfc672dcf323877228682aff79dff8ecd9f30ff8 (diff)
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits) Documentation/trace/events.txt: Remove obsolete sched_signal_send. writeback: fix global_dirty_limits comment runtime -> real-time ppc: fix comment typo singal -> signal drivers: fix comment typo diable -> disable. m68k: fix comment typo diable -> disable. wireless: comment typo fix diable -> disable. media: comment typo fix diable -> disable. remove doc for obsolete dynamic-printk kernel-parameter remove extraneous 'is' from Documentation/iostats.txt Fix spelling milisec -> ms in snd_ps3 module parameter description Fix spelling mistakes in comments Revert conflicting V4L changes i7core_edac: fix typos in comments mm/rmap.c: fix comment sound, ca0106: Fix assignment to 'channel'. hrtimer: fix a typo in comment init/Kconfig: fix typo anon_inodes: fix wrong function name in comment fix comment typos concerning "consistent" poll: fix a typo in comment ... Fix up trivial conflicts in: - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c) - fs/ext4/ext4.h Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libata-core.c4
-rw-r--r--drivers/ata/sata_vsc.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 0a6a943b3779..a31fe96f7de6 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -2240,7 +2240,7 @@ int ata_dev_configure(struct ata_device *dev)
2240 if (id[ATA_ID_CFA_KEY_MGMT] & 1) 2240 if (id[ATA_ID_CFA_KEY_MGMT] & 1)
2241 ata_dev_printk(dev, KERN_WARNING, 2241 ata_dev_printk(dev, KERN_WARNING,
2242 "supports DRM functions and may " 2242 "supports DRM functions and may "
2243 "not be fully accessable.\n"); 2243 "not be fully accessible.\n");
2244 snprintf(revbuf, 7, "CFA"); 2244 snprintf(revbuf, 7, "CFA");
2245 } else { 2245 } else {
2246 snprintf(revbuf, 7, "ATA-%d", ata_id_major_version(id)); 2246 snprintf(revbuf, 7, "ATA-%d", ata_id_major_version(id));
@@ -2248,7 +2248,7 @@ int ata_dev_configure(struct ata_device *dev)
2248 if (ata_id_has_tpm(id)) 2248 if (ata_id_has_tpm(id))
2249 ata_dev_printk(dev, KERN_WARNING, 2249 ata_dev_printk(dev, KERN_WARNING,
2250 "supports DRM functions and may " 2250 "supports DRM functions and may "
2251 "not be fully accessable.\n"); 2251 "not be fully accessible.\n");
2252 } 2252 }
2253 2253
2254 dev->n_sectors = ata_id_n_sectors(id); 2254 dev->n_sectors = ata_id_n_sectors(id);
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
index b777176ff494..e079cf29ed5d 100644
--- a/drivers/ata/sata_vsc.c
+++ b/drivers/ata/sata_vsc.c
@@ -370,7 +370,7 @@ static int __devinit vsc_sata_init_one(struct pci_dev *pdev,
370 if (pci_resource_len(pdev, 0) == 0) 370 if (pci_resource_len(pdev, 0) == 0)
371 return -ENODEV; 371 return -ENODEV;
372 372
373 /* map IO regions and intialize host accordingly */ 373 /* map IO regions and initialize host accordingly */
374 rc = pcim_iomap_regions(pdev, 1 << VSC_MMIO_BAR, DRV_NAME); 374 rc = pcim_iomap_regions(pdev, 1 << VSC_MMIO_BAR, DRV_NAME);
375 if (rc == -EBUSY) 375 if (rc == -EBUSY)
376 pcim_pin_device(pdev); 376 pcim_pin_device(pdev);