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
commit0559599477a066290d50223db83e1c0f3ecc361c (patch)
treeb43fd13c5d9fee36bf6f062587ff909da2565d29
parent9dc0ee886a85be424780a3b7a98b76a0bbc389a1 (diff)
downloadmaster-187ad058-0559599477a066290d50223db83e1c0f3ecc361c.tar.gz
master-187ad058-0559599477a066290d50223db83e1c0f3ecc361c.tar.bz2
master-187ad058-0559599477a066290d50223db83e1c0f3ecc361c.zip
pci_module_init() is deprecated for a long time - this won't hurt .21 and will be needed for .22
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7937 3c298f89-4303-0410-b956-a3cf2f4a3e73
-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);
}