diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 18:41:42 -0800 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 18:41:42 -0800 | 
| commit | 977127174a7dff52d17faeeb4c4949a54221881f (patch) | |
| tree | b05b9d18a1256d7ed97bdfb537213a8d70ccca57 /drivers/pci/proc.c | |
| parent | 80c0531514516e43ae118ddf38424e06e5c3cb3c (diff) | |
| parent | 93b47684f60cf25e8cefe19a21d94aa0257fdf36 (diff) | |
| download | olio-linux-3.10-977127174a7dff52d17faeeb4c4949a54221881f.tar.xz olio-linux-3.10-977127174a7dff52d17faeeb4c4949a54221881f.zip  | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'drivers/pci/proc.c')
| -rw-r--r-- | drivers/pci/proc.c | 3 | 
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c index 9cb6dd0834b..92a88576083 100644 --- a/drivers/pci/proc.c +++ b/drivers/pci/proc.c @@ -431,6 +431,7 @@ int pci_proc_detach_device(struct pci_dev *dev)  	return 0;  } +#if 0  int pci_proc_attach_bus(struct pci_bus* bus)  {  	struct proc_dir_entry *de = bus->procdir; @@ -447,6 +448,7 @@ int pci_proc_attach_bus(struct pci_bus* bus)  	}  	return 0;  } +#endif  /*  0  */  int pci_proc_detach_bus(struct pci_bus* bus)  { @@ -612,7 +614,6 @@ __initcall(pci_proc_init);  #ifdef CONFIG_HOTPLUG  EXPORT_SYMBOL(pci_proc_attach_device); -EXPORT_SYMBOL(pci_proc_attach_bus);  EXPORT_SYMBOL(pci_proc_detach_bus);  #endif  |