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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
pci
/
hotplug
/
cpcihp_generic.c
diff --git
a/drivers/pci/hotplug/cpcihp_generic.c
b/drivers/pci/hotplug/cpcihp_generic.c
index
2d4639d
..
f3852a6
100644
(file)
--- a/
drivers/pci/hotplug/cpcihp_generic.c
+++ b/
drivers/pci/hotplug/cpcihp_generic.c
@@
-34,7
+34,6
@@
* Send feedback to <scottm@somanetworks.com>
*/
* Send feedback to <scottm@somanetworks.com>
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/errno.h>
@@
-85,7
+84,7
@@
static int __init validate_parameters(void)
if(!bridge) {
info("not configured, disabling.");
if(!bridge) {
info("not configured, disabling.");
- return
1
;
+ return
-EINVAL
;
}
str = bridge;
if(!*str)
}
str = bridge;
if(!*str)
@@
-148,7
+147,7
@@
static int __init cpcihp_generic_init(void)
info(DRIVER_DESC " version: " DRIVER_VERSION);
status = validate_parameters();
info(DRIVER_DESC " version: " DRIVER_VERSION);
status = validate_parameters();
- if
(status != 0
)
+ if
(status
)
return status;
r = request_region(port, 1, "#ENUM hotswap signal register");
return status;
r = request_region(port, 1, "#ENUM hotswap signal register");