From: John Crispin <john@openwrt.org>
Date: Thu, 7 Jul 2011 18:20:07 +0000 (+0000)
Subject: remove CONFIG_MTD_PARTITIONS references from lantiq 3.0 patches
X-Git-Tag: reboot~16294
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=dc69e5f2e345482f18557c3629643d03d3b0db76;p=openwrt%2Fstaging%2Fnoltari.git

remove CONFIG_MTD_PARTITIONS references from lantiq 3.0 patches

SVN-Revision: 27532
---

diff --git a/target/linux/lantiq/patches-3.0/450-mach-arv45xx.patch b/target/linux/lantiq/patches-3.0/450-mach-arv45xx.patch
index 05b28b798f..711dd76768 100644
--- a/target/linux/lantiq/patches-3.0/450-mach-arv45xx.patch
+++ b/target/linux/lantiq/patches-3.0/450-mach-arv45xx.patch
@@ -20,7 +20,7 @@
 +obj-$(CONFIG_LANTIQ_MACH_ARV45XX) += mach-arv45xx.o
 --- /dev/null
 +++ b/arch/mips/lantiq/xway/mach-arv45xx.c
-@@ -0,0 +1,504 @@
+@@ -0,0 +1,495 @@
 +/*
 + *  This program is free software; you can redistribute it and/or modify it
 + *  under the terms of the GNU General Public License version 2 as published
@@ -50,7 +50,6 @@
 +#include "dev-leds-gpio.h"
 +#include "dev-dwc_otg.h"
 +
-+#ifdef CONFIG_MTD_PARTITIONS
 +static struct mtd_partition arv4510_partitions[] =
 +{
 +	{
@@ -123,27 +122,19 @@
 +	},
 +};
 +
-+#endif
-+
 +static struct physmap_flash_data arv4510_flash_data = {
-+#ifdef CONFIG_MTD_PARTITIONS
 +	.nr_parts	= ARRAY_SIZE(arv4510_partitions),
 +	.parts		= arv4510_partitions,
-+#endif
 +};
 +
 +static struct physmap_flash_data arv45xx_flash_data = {
-+#ifdef CONFIG_MTD_PARTITIONS
 +	.nr_parts	= ARRAY_SIZE(arv45xx_partitions),
 +	.parts		= arv45xx_partitions,
-+#endif
 +};
 +
 +static struct physmap_flash_data arv75xx_flash_data = {
-+#ifdef CONFIG_MTD_PARTITIONS
 +	.nr_parts	= ARRAY_SIZE(arv75xx_partitions),
 +	.parts		= arv75xx_partitions,
-+#endif
 +};
 +
 +static struct ltq_pci_data ltq_pci_data = {
diff --git a/target/linux/lantiq/patches-3.0/470-mach-gigasx76x.patch b/target/linux/lantiq/patches-3.0/470-mach-gigasx76x.patch
index 5897abe937..3cce208ec2 100644
--- a/target/linux/lantiq/patches-3.0/470-mach-gigasx76x.patch
+++ b/target/linux/lantiq/patches-3.0/470-mach-gigasx76x.patch
@@ -20,7 +20,7 @@
 +obj-$(CONFIG_LANTIQ_MACH_GIGASX76X) += mach-gigasx76x.o
 --- /dev/null
 +++ b/arch/mips/lantiq/xway/mach-gigasx76x.c
-@@ -0,0 +1,113 @@
+@@ -0,0 +1,109 @@
 +/*
 + *  This program is free software; you can redistribute it and/or modify it
 + *  under the terms of the GNU General Public License version 2 as published
@@ -54,7 +54,6 @@
 +#include "dev-dwc_otg.h"
 +#include "dev-leds-gpio.h"
 +
-+#ifdef CONFIG_MTD_PARTITIONS
 +static struct mtd_partition gigasx76x_partitions[] =
 +{
 +	{
@@ -83,7 +82,6 @@
 +		.size	= 0x10000,
 +	},
 +};
-+#endif
 +
 +static struct gpio_led
 +gigasx76x_leds_gpio[] __initdata = {
@@ -97,10 +95,8 @@
 +
 +
 +static struct physmap_flash_data gigasx76x_flash_data = {
-+#ifdef CONFIG_MTD_PARTITIONS
 +	.nr_parts	= ARRAY_SIZE(gigasx76x_partitions),
 +	.parts		= gigasx76x_partitions,
-+#endif
 +};
 +
 +static struct ltq_pci_data ltq_pci_data = {