diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:54:28 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:54:28 +0400 |
| commit | 6ebfc0e20b409f13e62bbb84ce70102b49945cfd (patch) | |
| tree | 67fea9b9c039ba47f96c7d51d8b2959b35543edf /arch/sh/drivers/pci/ops-sh03.c | |
| parent | 1e9abb5b1dc90cfcf0e6f1e10f7aaf34d0f33b6b (diff) | |
| parent | fac99d97469e7f91102f97101bea620e5f073196 (diff) | |
| download | linux-6ebfc0e20b409f13e62bbb84ce70102b49945cfd.tar.xz | |
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/ops-sh03.c')
| -rw-r--r-- | arch/sh/drivers/pci/ops-sh03.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 }, }; |