aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc64/kernel/pci.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-08-25 19:21:08 -0400
committerDavid S. Miller <davem@davemloft.net>2008-08-25 19:21:08 -0400
commit783c98b911fce8d47aa2906468ca39d44d46d7ce (patch)
tree617c06ce9b5b2f0221eb5ace74a4db93441db1c0 /arch/sparc64/kernel/pci.c
parent85269eb5542b425b99d79dc4c312dce0157eac7e (diff)
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.c18
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 @@
28 28
29#include "pci_impl.h" 29#include "pci_impl.h"
30 30
31#ifndef CONFIG_PCI
32/* A "nop" PCI implementation. */
33asmlinkage int sys_pciconfig_read(unsigned long bus, unsigned long dfn,
34 unsigned long off, unsigned long len,
35 unsigned char *buf)
36{
37 return 0;
38}
39asmlinkage int sys_pciconfig_write(unsigned long bus, unsigned long dfn,
40 unsigned long off, unsigned long len,
41 unsigned char *buf)
42{
43 return 0;
44}
45#else
46
47/* List of all PCI controllers found in the system. */ 31/* List of all PCI controllers found in the system. */
48struct pci_pbm_info *pci_pbm_root = NULL; 32struct pci_pbm_info *pci_pbm_root = NULL;
49 33
@@ -1215,5 +1199,3 @@ void pci_resource_to_user(const struct pci_dev *pdev, int bar,
1215 *start = rp->start - offset; 1199 *start = rp->start - offset;
1216 *end = rp->end - offset; 1200 *end = rp->end - offset;
1217} 1201}
1218
1219#endif /* !(CONFIG_PCI) */