pci_module_init() is deprecated for a long time - this won't hurt .21 and will be...

SVN-Revision: 7937

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 fd16d90b7f4569e1310bfb9b9ac65980a5198643..3bd6cf222b400ecd68bfddaeabbec3aaf2b5299c 100644 (file)
--- 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 2398031d5f77899d8e7afbb715d3903d32ddfb54..f495b4af69a0e8057a3cb59ba49df163fb928bc8 100644 (file)
--- 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);
 }