diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-02-10 08:19:33 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-02-10 08:19:33 +0000 |
commit | fe0c7aac669c960c7cc9683d5068980bf732c2f6 (patch) | |
tree | 9a7d0cc9c7c533b21aaf9455b01ce17dcf76a3a0 /target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c | |
parent | d72bde99cd03721fd5b04a1b365bd3f30d4277d9 (diff) | |
download | upstream-fe0c7aac669c960c7cc9683d5068980bf732c2f6.tar.gz upstream-fe0c7aac669c960c7cc9683d5068980bf732c2f6.tar.bz2 upstream-fe0c7aac669c960c7cc9683d5068980bf732c2f6.zip |
ar71xx: merge 3.2 fixes
SVN-Revision: 30406
Diffstat (limited to 'target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c')
-rw-r--r-- | target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c b/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c index f73137d105..1cb8f82407 100644 --- a/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c +++ b/target/linux/ar71xx/files/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(struct platform_device *pdev) 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; |