diff options
| author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-02-10 08:19:33 +0000 |
|---|---|---|
| committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-02-10 08:19:33 +0000 |
| commit | 8940cbc303a16f2cb7dcbcf91d01401b5f14b742 (patch) | |
| tree | 6dcf8415967ca61be25c9a055249016b10caa9eb /target/linux/ar71xx/patches-3.2/302-rb4xx_nand-3.2-fixes.patch | |
| parent | d9077e15ae00813535ac3f226c7f74f3422df8c2 (diff) | |
ar71xx: merge 3.2 fixes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30406 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-3.2/302-rb4xx_nand-3.2-fixes.patch')
| -rw-r--r-- | target/linux/ar71xx/patches-3.2/302-rb4xx_nand-3.2-fixes.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/target/linux/ar71xx/patches-3.2/302-rb4xx_nand-3.2-fixes.patch b/target/linux/ar71xx/patches-3.2/302-rb4xx_nand-3.2-fixes.patch deleted file mode 100644 index 0a133f0ce..000000000 --- a/target/linux/ar71xx/patches-3.2/302-rb4xx_nand-3.2-fixes.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/drivers/mtd/nand/rb4xx_nand.c -+++ b/drivers/mtd/nand/rb4xx_nand.c -@@ -12,6 +12,8 @@ - * by the Free Software Foundation. - */ - -+#include <linux/kernel.h> -+#include <linux/module.h> - #include <linux/init.h> - #include <linux/mtd/nand.h> - #include <linux/mtd/mtd.h> -@@ -22,8 +24,8 @@ - #include <linux/gpio.h> - #include <linux/slab.h> - --#include <asm/mach-ar71xx/ar71xx.h> --#include <asm/mach-ar71xx/rb4xx_cpld.h> -+#include <asm/mach-ath79/ath79.h> -+#include <asm/mach-ath79/rb4xx_cpld.h> - - #define DRV_NAME "rb4xx-nand" - #define DRV_VERSION "0.2.0" -@@ -238,12 +240,8 @@ static int __devinit rb4xx_nand_probe(st - goto err_set_drvdata; - } - --#ifdef CONFIG_MTD_PARTITIONS -- ret = add_mtd_partitions(&info->mtd, rb4xx_nand_partitions, -+ mtd_device_register(&info->mtd, rb4xx_nand_partitions, - ARRAY_SIZE(rb4xx_nand_partitions)); --#else -- ret = add_mtd_device(&info->mtd); --#endif - if (ret) - goto err_release_nand; - |