diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-05-26 19:41:42 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-05-26 19:41:42 +0000 |
commit | a3df50fd61e049a5827878459d7bf0b9e670f2ba (patch) | |
tree | b2ebe5f370ac75b461e97fff8677e2fd9373756f /target/linux/generic-2.6/patches/013-mips_generic_gpio_support.patch | |
parent | 62866afbacccec283c7aaed648825fb27272ac3f (diff) |
refresh kernel patches so that they apply cleanly
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7347 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches/013-mips_generic_gpio_support.patch')
-rw-r--r-- | target/linux/generic-2.6/patches/013-mips_generic_gpio_support.patch | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/target/linux/generic-2.6/patches/013-mips_generic_gpio_support.patch b/target/linux/generic-2.6/patches/013-mips_generic_gpio_support.patch index 5e0ae2e708..489e9acf9d 100644 --- a/target/linux/generic-2.6/patches/013-mips_generic_gpio_support.patch +++ b/target/linux/generic-2.6/patches/013-mips_generic_gpio_support.patch @@ -1,5 +1,17 @@ ---- linux-2.6.21.1/arch/mips/Kconfig 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1-owrt/arch/mips/Kconfig 2007-05-24 13:51:13.000000000 +0200 +diff -urN linux-2.6.21.1.old/arch/mips/defconfig linux-2.6.21.1.dev/arch/mips/defconfig +--- linux-2.6.21.1.old/arch/mips/defconfig 2007-04-27 23:49:26.000000000 +0200 ++++ linux-2.6.21.1.dev/arch/mips/defconfig 2007-05-26 19:55:17.542651920 +0200 +@@ -69,6 +69,7 @@ + CONFIG_GENERIC_HWEIGHT=y + CONFIG_GENERIC_CALIBRATE_DELAY=y + CONFIG_GENERIC_TIME=y ++CONFIG_GENERIC_GPIO=n + CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y + # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set + CONFIG_ARC=y +diff -urN linux-2.6.21.1.old/arch/mips/Kconfig linux-2.6.21.1.dev/arch/mips/Kconfig +--- linux-2.6.21.1.old/arch/mips/Kconfig 2007-04-27 23:49:26.000000000 +0200 ++++ linux-2.6.21.1.dev/arch/mips/Kconfig 2007-05-26 19:55:17.500658304 +0200 @@ -869,6 +869,10 @@ bool default y @@ -11,8 +23,9 @@ config SCHED_NO_NO_OMIT_FRAME_POINTER bool default y ---- linux-2.6.21.1/include/asm-mips/gpio.h 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.21.1-owrt/include/asm-mips/gpio.h 2007-05-24 13:51:13.000000000 +0200 +diff -urN linux-2.6.21.1.old/include/asm-mips/gpio.h linux-2.6.21.1.dev/include/asm-mips/gpio.h +--- linux-2.6.21.1.old/include/asm-mips/gpio.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.21.1.dev/include/asm-mips/gpio.h 2007-05-26 19:55:17.500658304 +0200 @@ -0,0 +1,6 @@ +#ifndef _ASM_MIPS_GPIO_H +#define _ASM_MIPS_GPIO_H @@ -20,13 +33,3 @@ +#include <gpio.h> + +#endif /* _ASM_MIPS_GPIO_H */ ---- linux-2.6.21.1/arch/mips/defconfig 2007-04-27 23:49:26.000000000 +0200 -+++ linux-2.6.21.1-owrt/arch/mips/defconfig 2007-05-24 14:37:52.000000000 +0200 -@@ -71,6 +71,7 @@ - CONFIG_GENERIC_HWEIGHT=y - CONFIG_GENERIC_CALIBRATE_DELAY=y - CONFIG_GENERIC_TIME=y -+CONFIG_GENERIC_GPIO=n - CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y - # CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set - CONFIG_ARC=y |