diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 16:35:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 16:35:11 -0700 |
| commit | 708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch) | |
| tree | fe7c31bc0edef84eb1075c7e195340047d6aaa17 /arch/sh/drivers/pci | |
| parent | f3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff) | |
| parent | a847825970e741e20a09c659978baa34016b63bc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
Add missing maintainer countries in CREDITS
Fix bytes <-> kilobytes typo in Kconfig for ramdisk
fix a typo in Documentation/pi-futex.txt
BUG_ON conversion for fs/xfs/
BUG_ON() conversion in fs/nfsd/
BUG_ON conversion for fs/reiserfs
BUG_ON cleanups in arch/i386
BUG_ON cleanup in drivers/net/tokenring/
BUG_ON cleanup for drivers/md/
kerneldoc-typo in led-class.c
debugfs: spelling fix
rcutorture: Fix incorrect description of default for nreaders parameter
parport: Remove space in function calls
Michal Wronski: update contact info
Spelling fix: "control" instead of "cotrol"
reboot parameter in Documentation/kernel-parameters.txt
Fix copy&waste bug in comment in scripts/kernel-doc
remove duplicate "until" from kernel/workqueue.c
ite_gpio fix tabbage
fix file specification in comments
...
Fixed trivial path conflicts due to removed files:
arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'arch/sh/drivers/pci')
| -rw-r--r-- | arch/sh/drivers/pci/dma-dreamcast.c | 2 | ||||
| -rw-r--r-- | arch/sh/drivers/pci/fixups-dreamcast.c | 2 | ||||
| -rw-r--r-- | arch/sh/drivers/pci/ops-bigsur.c | 2 | ||||
| -rw-r--r-- | arch/sh/drivers/pci/ops-dreamcast.c | 2 | ||||
| -rw-r--r-- | arch/sh/drivers/pci/ops-rts7751r2d.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/sh/drivers/pci/dma-dreamcast.c b/arch/sh/drivers/pci/dma-dreamcast.c index 6acf02b9375b..230d6ec0d239 100644 --- a/arch/sh/drivers/pci/dma-dreamcast.c +++ b/arch/sh/drivers/pci/dma-dreamcast.c @@ -1,5 +1,5 @@ /* - * arch/sh/pci/dma-dreamcast.c + * arch/sh/drivers/pci/dma-dreamcast.c * * PCI DMA support for the Sega Dreamcast * diff --git a/arch/sh/drivers/pci/fixups-dreamcast.c b/arch/sh/drivers/pci/fixups-dreamcast.c index c0af5f7ef414..6f53f8200dc3 100644 --- a/arch/sh/drivers/pci/fixups-dreamcast.c +++ b/arch/sh/drivers/pci/fixups-dreamcast.c @@ -1,5 +1,5 @@ /* - * arch/sh/pci/fixups-dreamcast.c + * arch/sh/drivers/pci/fixups-dreamcast.c * * PCI fixups for the Sega Dreamcast * diff --git a/arch/sh/drivers/pci/ops-bigsur.c b/arch/sh/drivers/pci/ops-bigsur.c index 5da501bd77b5..eb31be751524 100644 --- a/arch/sh/drivers/pci/ops-bigsur.c +++ b/arch/sh/drivers/pci/ops-bigsur.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/pci-bigsur.c + * linux/arch/sh/drivers/pci/ops-bigsur.c * * By Dustin McIntire (dustin@sensoria.com) (c)2001 * diff --git a/arch/sh/drivers/pci/ops-dreamcast.c b/arch/sh/drivers/pci/ops-dreamcast.c index 23d52791917e..381306cf5425 100644 --- a/arch/sh/drivers/pci/ops-dreamcast.c +++ b/arch/sh/drivers/pci/ops-dreamcast.c @@ -1,5 +1,5 @@ /* - * arch/sh/pci/ops-dreamcast.c + * arch/sh/drivers/pci/ops-dreamcast.c * * PCI operations for the Sega Dreamcast * diff --git a/arch/sh/drivers/pci/ops-rts7751r2d.c b/arch/sh/drivers/pci/ops-rts7751r2d.c index 88f44e245424..b68824c8b81e 100644 --- a/arch/sh/drivers/pci/ops-rts7751r2d.c +++ b/arch/sh/drivers/pci/ops-rts7751r2d.c @@ -1,5 +1,5 @@ /* - * linux/arch/sh/kernel/pci-rts7751r2d.c + * linux/arch/sh/drivers/pci/ops-rts7751r2d.c * * Author: Ian DaSilva (idasilva@mvista.com) * |