diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 08:54:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 08:54:28 -0700 |
| commit | 6ebfc0e20b409f13e62bbb84ce70102b49945cfd (patch) | |
| tree | 67fea9b9c039ba47f96c7d51d8b2959b35543edf /arch/sh/drivers/pci | |
| parent | 1e9abb5b1dc90cfcf0e6f1e10f7aaf34d0f33b6b (diff) | |
| parent | fac99d97469e7f91102f97101bea620e5f073196 (diff) | |
| download | talos-op-linux-6ebfc0e20b409f13e62bbb84ce70102b49945cfd.tar.gz talos-op-linux-6ebfc0e20b409f13e62bbb84ce70102b49945cfd.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh: Fixup __raw_read_trylock().
sh: Kill off remaining config.h references.
sh: Initial gitignore list
sh: build fixes for defconfigs.
sh: Kill off more dead headers.
sh: Set pclk default for SH7705.
sh: defconfig updates.
Diffstat (limited to 'arch/sh/drivers/pci')
| -rw-r--r-- | arch/sh/drivers/pci/ops-landisk.c | 1 | ||||
| -rw-r--r-- | arch/sh/drivers/pci/ops-r7780rp.c | 2 | ||||
| -rw-r--r-- | arch/sh/drivers/pci/ops-sh03.c | 4 | ||||
| -rw-r--r-- | arch/sh/drivers/pci/ops-titan.c | 2 | ||||
| -rw-r--r-- | arch/sh/drivers/pci/pci-sh7780.c | 2 |
5 files changed, 2 insertions, 9 deletions
diff --git a/arch/sh/drivers/pci/ops-landisk.c b/arch/sh/drivers/pci/ops-landisk.c index ada301c21fe7..d06030815a96 100644 --- a/arch/sh/drivers/pci/ops-landisk.c +++ b/arch/sh/drivers/pci/ops-landisk.c @@ -8,7 +8,6 @@ * May be copied or modified under the terms of the GNU General Public * License. See linux/COPYING for more information. */ -#include <linux/config.h> #include <linux/kernel.h> #include <linux/types.h> #include <linux/init.h> diff --git a/arch/sh/drivers/pci/ops-r7780rp.c b/arch/sh/drivers/pci/ops-r7780rp.c index 554d5ed2c586..6e3ba9c65b40 100644 --- a/arch/sh/drivers/pci/ops-r7780rp.c +++ b/arch/sh/drivers/pci/ops-r7780rp.c @@ -8,8 +8,6 @@ * * PCI initialization for the Renesas SH7780 Highlander R7780RP-1 board */ - -#include <linux/config.h> #include <linux/kernel.h> #include <linux/types.h> #include <linux/init.h> diff --git a/arch/sh/drivers/pci/ops-sh03.c b/arch/sh/drivers/pci/ops-sh03.c index e58d556e5f94..ebb58e605d9d 100644 --- a/arch/sh/drivers/pci/ops-sh03.c +++ b/arch/sh/drivers/pci/ops-sh03.c @@ -35,10 +35,10 @@ static struct resource sh7751_mem_resource = { .flags = IORESOURCE_MEM }; -extern struct pci_ops sh7751_pci_ops; +extern struct pci_ops sh4_pci_ops; struct pci_channel board_pci_channels[] = { - { &sh7751_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff }, + { &sh4_pci_ops, &sh7751_io_resource, &sh7751_mem_resource, 0, 0xff }, { NULL, NULL, NULL, 0, 0 }, }; diff --git a/arch/sh/drivers/pci/ops-titan.c b/arch/sh/drivers/pci/ops-titan.c index c6097bcd97fd..cd56d53375e7 100644 --- a/arch/sh/drivers/pci/ops-titan.c +++ b/arch/sh/drivers/pci/ops-titan.c @@ -11,8 +11,6 @@ * * PCI initialization for the Titan boards */ - -#include <linux/config.h> #include <linux/kernel.h> #include <linux/types.h> #include <linux/init.h> diff --git a/arch/sh/drivers/pci/pci-sh7780.c b/arch/sh/drivers/pci/pci-sh7780.c index bd3064a82087..d6e635296534 100644 --- a/arch/sh/drivers/pci/pci-sh7780.c +++ b/arch/sh/drivers/pci/pci-sh7780.c @@ -12,10 +12,8 @@ * License. See linux/COPYING for more information. * */ - #undef DEBUG -#include <linux/config.h> #include <linux/types.h> #include <linux/kernel.h> #include <linux/init.h> |
