diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-26 01:21:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-26 01:21:08 +0200 |
| commit | 783c98b911fce8d47aa2906468ca39d44d46d7ce (patch) | |
| tree | 617c06ce9b5b2f0221eb5ace74a4db93441db1c0 /arch/sparc64/kernel/pci.c | |
| parent | sparc64: Add JBUS UltraSPARC-IIIi support to memory controller driver. (diff) | |
| download | linux-783c98b911fce8d47aa2906468ca39d44d46d7ce.tar.xz linux-783c98b911fce8d47aa2906468ca39d44d46d7ce.zip | |
sparc64: Use the cond_syscall()s in kernel/sys_ni.c instead of home-grown copy.
This also allows arch/sparc64/kernel/pci.c to be properly CONFIG_PCI
conditional compiled in the Makefile.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64/kernel/pci.c')
| -rw-r--r-- | arch/sparc64/kernel/pci.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c index 55096195458f..9bb4b8cbcacb 100644 --- a/arch/sparc64/kernel/pci.c +++ b/arch/sparc64/kernel/pci.c @@ -28,22 +28,6 @@ #include "pci_impl.h" -#ifndef CONFIG_PCI -/* A "nop" PCI implementation. */ -asmlinkage int sys_pciconfig_read(unsigned long bus, unsigned long dfn, - unsigned long off, unsigned long len, - unsigned char *buf) -{ - return 0; -} -asmlinkage int sys_pciconfig_write(unsigned long bus, unsigned long dfn, - unsigned long off, unsigned long len, - unsigned char *buf) -{ - return 0; -} -#else - /* List of all PCI controllers found in the system. */ struct pci_pbm_info *pci_pbm_root = NULL; @@ -1215,5 +1199,3 @@ void pci_resource_to_user(const struct pci_dev *pdev, int bar, *start = rp->start - offset; *end = rp->end - offset; } - -#endif /* !(CONFIG_PCI) */ |