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
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
scx200.c
diff --git
a/arch/i386/kernel/scx200.c
b/arch/i386/kernel/scx200.c
index
69e203a
..
321f5fd
100644
(file)
--- a/
arch/i386/kernel/scx200.c
+++ b/
arch/i386/kernel/scx200.c
@@
-12,6
+12,7
@@
#include <linux/pci.h>
#include <linux/scx200.h>
#include <linux/pci.h>
#include <linux/scx200.h>
+#include <linux/scx200_gpio.h>
/* Verify that the configuration block really is there */
#define scx200_cb_probe(base) (inw((base) + SCx200_CBA) == (base))
/* Verify that the configuration block really is there */
#define scx200_cb_probe(base) (inw((base) + SCx200_CBA) == (base))
@@
-142,7
+143,7
@@
static int __init scx200_init(void)
{
printk(KERN_INFO NAME ": NatSemi SCx200 Driver\n");
{
printk(KERN_INFO NAME ": NatSemi SCx200 Driver\n");
- return pci_
module_init
(&scx200_pci_driver);
+ return pci_
register_driver
(&scx200_pci_driver);
}
static void __exit scx200_cleanup(void)
}
static void __exit scx200_cleanup(void)