aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2007-07-12 10:29:54 +0000
committerImre Kaloz <kaloz@openwrt.org>2007-07-12 10:29:54 +0000
commitb35bedf094b33ede048aabfc5f612596a4f98f32 (patch)
tree250d46e5c89a0d86f11228222a9f82a858ccbba0
parentd2c338cd52bbb07983680fc4369529c7b396617c (diff)
downloadupstream-b35bedf094b33ede048aabfc5f612596a4f98f32.tar.gz
upstream-b35bedf094b33ede048aabfc5f612596a4f98f32.tar.bz2
upstream-b35bedf094b33ede048aabfc5f612596a4f98f32.zip
pci_module_init() is deprecated for a long time - this won't hurt .21 and will be needed for .22
SVN-Revision: 7937
-rw-r--r--target/linux/rdc-2.6/files/drivers/mtd/maps/rdc3210.c1
-rw-r--r--target/linux/rdc-2.6/files/drivers/net/r6040.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/target/linux/rdc-2.6/files/drivers/mtd/maps/rdc3210.c b/target/linux/rdc-2.6/files/drivers/mtd/maps/rdc3210.c
index fd16d90b7f..3bd6cf222b 100644
--- a/target/linux/rdc-2.6/files/drivers/mtd/maps/rdc3210.c
+++ b/target/linux/rdc-2.6/files/drivers/mtd/maps/rdc3210.c
@@ -14,6 +14,7 @@
#include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
#include <linux/autoconf.h>
+#include <linux/sched.h>
#include <linux/squashfs_fs.h>
static struct mtd_info *rdc3210_mtd;
diff --git a/target/linux/rdc-2.6/files/drivers/net/r6040.c b/target/linux/rdc-2.6/files/drivers/net/r6040.c
index 2398031d5f..f495b4af69 100644
--- a/target/linux/rdc-2.6/files/drivers/net/r6040.c
+++ b/target/linux/rdc-2.6/files/drivers/net/r6040.c
@@ -952,7 +952,7 @@ static int __init r6040_init (void)
printk(version);
printed_version = 1;
- return pci_module_init (&r6040_driver);
+ return pci_register_driver (&r6040_driver);
}