git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
pci
/
hotplug
/
cpci_hotplug_pci.c
diff --git
a/drivers/pci/hotplug/cpci_hotplug_pci.c
b/drivers/pci/hotplug/cpci_hotplug_pci.c
index
3aead25
..
2e96961
100644
(file)
--- a/
drivers/pci/hotplug/cpci_hotplug_pci.c
+++ b/
drivers/pci/hotplug/cpci_hotplug_pci.c
@@
-32,7
+32,7
@@
#include "pci_hotplug.h"
#include "cpci_hotplug.h"
#include "pci_hotplug.h"
#include "cpci_hotplug.h"
-#if !defined(
CONFIG_HOTPLUG_CPCI_
MODULE)
+#if !defined(MODULE)
#define MY_NAME "cpci_hotplug"
#else
#define MY_NAME THIS_MODULE->name
#define MY_NAME "cpci_hotplug"
#else
#define MY_NAME THIS_MODULE->name
@@
-127,6
+127,7
@@
u16 cpci_get_hs_csr(struct slot* slot)
return hs_csr;
}
return hs_csr;
}
+#if 0
u16 cpci_set_hs_csr(struct slot* slot, u16 hs_csr)
{
int hs_cap;
u16 cpci_set_hs_csr(struct slot* slot, u16 hs_csr)
{
int hs_cap;
@@
-156,6
+157,7
@@
u16 cpci_set_hs_csr(struct slot* slot, u16 hs_csr)
}
return new_hs_csr;
}
}
return new_hs_csr;
}
+#endif
int cpci_check_and_clear_ins(struct slot* slot)
{
int cpci_check_and_clear_ins(struct slot* slot)
{