diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-24 16:41:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-24 16:41:39 -0400 |
| commit | 229aebb873e29726b91e076161649cf45154b0bf (patch) | |
| tree | acc02a3702215bce8d914f4c8cc3d7a1382b1c67 /drivers/ata | |
| parent | 8de547e1824437f3c6af180d3ed2162fa4b3f389 (diff) | |
| parent | 50a23e6eec6f20d55a3a920e47adb455bff6046e (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: (39 commits)
Update broken web addresses in arch directory.
Update broken web addresses in the kernel.
Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
Revert "Fix typo: configuation => configuration" partially
ida: document IDA_BITMAP_LONGS calculation
ext2: fix a typo on comment in ext2/inode.c
drivers/scsi: Remove unnecessary casts of private_data
drivers/s390: Remove unnecessary casts of private_data
net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
drivers/infiniband: Remove unnecessary casts of private_data
drivers/gpu/drm: Remove unnecessary casts of private_data
kernel/pm_qos_params.c: Remove unnecessary casts of private_data
fs/ecryptfs: Remove unnecessary casts of private_data
fs/seq_file.c: Remove unnecessary casts of private_data
arm: uengine.c: remove C99 comments
arm: scoop.c: remove C99 comments
Fix typo configue => configure in comments
Fix typo: configuation => configuration
Fix typo interrest[ing|ed] => interest[ing|ed]
Fix various typos of valid in comments
...
Fix up trivial conflicts in:
drivers/char/ipmi/ipmi_si_intf.c
drivers/usb/gadget/rndis.c
net/irda/irnet/irnet_ppp.c
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/pata_bf54x.c | 2 | ||||
| -rw-r--r-- | drivers/ata/pata_it821x.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/pata_bf54x.c b/drivers/ata/pata_bf54x.c index ec2c777fcdb0..7aed5c792597 100644 --- a/drivers/ata/pata_bf54x.c +++ b/drivers/ata/pata_bf54x.c | |||
| @@ -1588,7 +1588,7 @@ static int __devinit bfin_atapi_probe(struct platform_device *pdev) | |||
| 1588 | host->ports[0]->ioaddr.ctl_addr = (void *)res->start; | 1588 | host->ports[0]->ioaddr.ctl_addr = (void *)res->start; |
| 1589 | 1589 | ||
| 1590 | if (peripheral_request_list(atapi_io_port, "atapi-io-port")) { | 1590 | if (peripheral_request_list(atapi_io_port, "atapi-io-port")) { |
| 1591 | dev_err(&pdev->dev, "Requesting Peripherals faild\n"); | 1591 | dev_err(&pdev->dev, "Requesting Peripherals failed\n"); |
| 1592 | return -EFAULT; | 1592 | return -EFAULT; |
| 1593 | } | 1593 | } |
| 1594 | 1594 | ||
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c index bf88f71a21f4..aa0e0c51cc08 100644 --- a/drivers/ata/pata_it821x.c +++ b/drivers/ata/pata_it821x.c | |||
| @@ -15,8 +15,8 @@ | |||
| 15 | * May be copied or modified under the terms of the GNU General Public License | 15 | * May be copied or modified under the terms of the GNU General Public License |
| 16 | * Based in part on the ITE vendor provided SCSI driver. | 16 | * Based in part on the ITE vendor provided SCSI driver. |
| 17 | * | 17 | * |
| 18 | * Documentation available from | 18 | * Documentation available from IT8212F_V04.pdf |
| 19 | * http://www.ite.com.tw/pc/IT8212F_V04.pdf | 19 | * http://www.ite.com.tw/EN/products_more.aspx?CategoryID=3&ID=5,91 |
| 20 | * Some other documents are NDA. | 20 | * Some other documents are NDA. |
| 21 | * | 21 | * |
| 22 | * The ITE8212 isn't exactly a standard IDE controller. It has two | 22 | * The ITE8212 isn't exactly a standard IDE controller. It has two |