aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngus Ainslie <nytowl@openmoko.org>2009-08-06 00:08:42 -0600
committerAngus Ainslie <nytowl@openmoko.org>2009-08-06 00:08:42 -0600
commit54eaaa2f58af1412d40b9860fa967351fdd528c9 (patch)
treea95032e0397bba07305efaa3630d6b4d320257c2
parent0547b372625c6afb81be4e34e37e75d5da58e994 (diff)
downloadopenembedded-54eaaa2f58af1412d40b9860fa967351fdd528c9.tar.gz
Revert "linux-openmoko-2.6.30.1 : update openwrt patches"
This reverts commit 0547b372625c6afb81be4e34e37e75d5da58e994.
-rw-r--r--recipes/linux/linux-openmoko-2.6.30.1/057-lis302dl.patch3
-rw-r--r--recipes/linux/linux-openmoko-2.6.30.1/defconfig12
-rw-r--r--recipes/linux/linux-openmoko-2.6.30.1/openwrt-files.tgzbin592050 -> 591550 bytes
-rw-r--r--recipes/linux/linux-openmoko_2.6.30.1.bb2
4 files changed, 4 insertions, 13 deletions
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/057-lis302dl.patch b/recipes/linux/linux-openmoko-2.6.30.1/057-lis302dl.patch
index 1a707d9bea..ebb194bf3c 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/057-lis302dl.patch
+++ b/recipes/linux/linux-openmoko-2.6.30.1/057-lis302dl.patch
@@ -18,7 +18,8 @@
depends on MFD_PCF50633
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
-@@ -25,2 +25,3 @@ obj-$(CONFIG_INPUT_UINPUT) += uinput.o
+@@ -25,3 +25,4 @@ obj-$(CONFIG_INPUT_UINPUT) += uinput.o
obj-$(CONFIG_INPUT_WISTRON_BTNS) += wistron_btns.o
obj-$(CONFIG_INPUT_YEALINK) += yealink.o
+ obj-$(CONFIG_INPUT_GPIO_BUTTONS) += gpio_buttons.o
+obj-$(CONFIG_INPUT_LIS302DL) += lis302dl.o
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/defconfig b/recipes/linux/linux-openmoko-2.6.30.1/defconfig
index 9f33575f80..2ba450aa86 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/defconfig
+++ b/recipes/linux/linux-openmoko-2.6.30.1/defconfig
@@ -705,17 +705,7 @@ CONFIG_COMPAT_NET_DEV_OPS=y
# CONFIG_USB_USBNET is not set
# CONFIG_USB_HSO is not set
# CONFIG_WAN is not set
-CONFIG_PPP=m
-# CONFIG_PPP_MULTILINK is not set
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_MPPE=m
-# CONFIG_PPPOE is not set
-CONFIG_PPPOL2TP=m
-
+# CONFIG_PPP is not set
# CONFIG_SLIP is not set
# CONFIG_NETCONSOLE is not set
# CONFIG_NETPOLL is not set
diff --git a/recipes/linux/linux-openmoko-2.6.30.1/openwrt-files.tgz b/recipes/linux/linux-openmoko-2.6.30.1/openwrt-files.tgz
index 50a811a633..cc5d68a3e4 100644
--- a/recipes/linux/linux-openmoko-2.6.30.1/openwrt-files.tgz
+++ b/recipes/linux/linux-openmoko-2.6.30.1/openwrt-files.tgz
Binary files differ
diff --git a/recipes/linux/linux-openmoko_2.6.30.1.bb b/recipes/linux/linux-openmoko_2.6.30.1.bb
index 6d691e486e..9f09f6ab84 100644
--- a/recipes/linux/linux-openmoko_2.6.30.1.bb
+++ b/recipes/linux/linux-openmoko_2.6.30.1.bb
@@ -39,7 +39,7 @@ SRC_URI = "\
file://110-serial.patch;patch=1 \
file://120-fix-wm8753-reg_cache.patch;patch=1 \
file://130-fix-s3c_gpiolib_getchip.patch;patch=1 \
- file://750-glamo-headers.patch;patch=1 \
+# file://750-glamo-headers.patch;patch=1 \
# file://150-ignore-init-argument.patch;patch=1 \
"