diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2010-08-14 21:07:42 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2010-08-14 21:07:42 +0000 |
| commit | 10f0eb32c9dac91f027af809959d65270f9db286 (patch) | |
| tree | ee2f77f12841052587d853776f7d9b712972da73 /target/linux/ixp4xx/patches-2.6.35/402-ixp4xx_gpiolib.patch | |
| parent | d980fa48acf946bc7db613089723d3eae23ee078 (diff) | |
| download | upstream-10f0eb32c9dac91f027af809959d65270f9db286.tar.gz upstream-10f0eb32c9dac91f027af809959d65270f9db286.tar.bz2 upstream-10f0eb32c9dac91f027af809959d65270f9db286.zip | |
ixp4xx: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22649 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.35/402-ixp4xx_gpiolib.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.35/402-ixp4xx_gpiolib.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.35/402-ixp4xx_gpiolib.patch b/target/linux/ixp4xx/patches-2.6.35/402-ixp4xx_gpiolib.patch index 0d5a25378b..bfe22272f3 100644 --- a/target/linux/ixp4xx/patches-2.6.35/402-ixp4xx_gpiolib.patch +++ b/target/linux/ixp4xx/patches-2.6.35/402-ixp4xx_gpiolib.patch @@ -1,6 +1,6 @@ --- a/arch/arm/mach-ixp4xx/common.c +++ b/arch/arm/mach-ixp4xx/common.c -@@ -36,6 +36,7 @@ +@@ -35,6 +35,7 @@ #include <asm/pgtable.h> #include <asm/page.h> #include <asm/irq.h> @@ -8,7 +8,7 @@ #include <asm/mach/map.h> #include <asm/mach/irq.h> -@@ -375,12 +376,39 @@ static struct platform_device *ixp46x_de +@@ -374,12 +375,39 @@ static struct platform_device *ixp46x_de unsigned long ixp4xx_exp_bus_size; EXPORT_SYMBOL(ixp4xx_exp_bus_size); @@ -50,9 +50,9 @@ --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -417,6 +417,7 @@ config ARCH_IXP4XX +@@ -435,6 +435,7 @@ config ARCH_IXP4XX + select CPU_XSCALE select GENERIC_GPIO - select GENERIC_TIME select GENERIC_CLOCKEVENTS + select ARCH_REQUIRE_GPIOLIB help |