[oe-commits] Andrea Adami : Revert "linux: update Zaurus defconfigs"

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 2443357a732bc75e62fcaa96f5f4d270de74e88d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=2443357a732bc75e62fcaa96f5f4d270de74e88d

Author: Andrea Adami <andrea.adami at gmail.com>
Date:   Fri Apr 29 22:54:58 2011 +0200

Revert "linux: update Zaurus defconfigs"

This reverts commit 63edb15ae9d37de9fa784eeff5a0448cf68d7244.

---

 recipes/kexecboot/kexecboot.inc             |    2 +-
 recipes/linux/linux-2.6.38/akita/defconfig  |    2 +-
 recipes/linux/linux-2.6.38/c7x0/defconfig   |    2 +-
 recipes/linux/linux-2.6.38/collie/defconfig |    2 +-
 recipes/linux/linux-2.6.38/poodle/defconfig |    2 +-
 recipes/linux/linux-2.6.38/spitz/defconfig  |    2 +-
 recipes/linux/linux-2.6.38/tosa/defconfig   |    2 +-
 recipes/linux/linux_2.6.38.bb               |    2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/recipes/kexecboot/kexecboot.inc b/recipes/kexecboot/kexecboot.inc
index b7954c2..ef11066 100644
--- a/recipes/kexecboot/kexecboot.inc
+++ b/recipes/kexecboot/kexecboot.inc
@@ -38,7 +38,7 @@ inherit autotools
 # Zaurus clamshells looks better at 480x480
 
 EXTRA_OECONF_akita = "--enable-zaurus --enable-delay=2 --enable-evdev-rate=1000,250 --enable-fbui-width=480"
-EXTRA_OECONF_c7x0 = "--enable-zaurus --enable-delay=2 --enable-evdev-rate=1000,250"
+EXTRA_OECONF_c7x0 = "--enable-zaurus --enable-delay=2 --enable-evdev-rate=1000,250 --enable-fbui-width=480"
 EXTRA_OECONF_spitz = "--enable-zaurus --enable-delay=3 --enable-evdev-rate=1000,250 --enable-fbui-width=480"
 EXTRA_OECONF_poodle = "--enable-zaurus --enable-delay=2 --enable-evdev-rate=1000,250"
 EXTRA_OECONF_tosa = "--enable-zaurus --enable-delay=2 --enable-evdev-rate=1000,250"
diff --git a/recipes/linux/linux-2.6.38/akita/defconfig b/recipes/linux/linux-2.6.38/akita/defconfig
index 0ad3bfe..f8ceafc 100644
--- a/recipes/linux/linux-2.6.38/akita/defconfig
+++ b/recipes/linux/linux-2.6.38/akita/defconfig
@@ -170,7 +170,7 @@ CONFIG_KEYBOARD_MATRIX=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ADS7846=y
 CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_UINPUT=y
 # CONFIG_SERIO is not set
 CONFIG_SERIAL_8250=m
 CONFIG_SERIAL_8250_CS=m
diff --git a/recipes/linux/linux-2.6.38/c7x0/defconfig b/recipes/linux/linux-2.6.38/c7x0/defconfig
index eb8e730..cafef31 100644
--- a/recipes/linux/linux-2.6.38/c7x0/defconfig
+++ b/recipes/linux/linux-2.6.38/c7x0/defconfig
@@ -171,7 +171,7 @@ CONFIG_KEYBOARD_MATRIX=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ADS7846=y
 CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_UINPUT=y
 # CONFIG_SERIO is not set
 CONFIG_SERIAL_8250=m
 CONFIG_SERIAL_8250_CS=m
diff --git a/recipes/linux/linux-2.6.38/collie/defconfig b/recipes/linux/linux-2.6.38/collie/defconfig
index 74044c7..da09884 100644
--- a/recipes/linux/linux-2.6.38/collie/defconfig
+++ b/recipes/linux/linux-2.6.38/collie/defconfig
@@ -168,7 +168,7 @@ CONFIG_KEYBOARD_LOCOMO=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ADS7846=y
 CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_UINPUT=y
 # CONFIG_SERIO is not set
 CONFIG_SERIAL_8250=m
 CONFIG_SERIAL_8250_CS=m
diff --git a/recipes/linux/linux-2.6.38/poodle/defconfig b/recipes/linux/linux-2.6.38/poodle/defconfig
index d5d57e0..eb6177e 100644
--- a/recipes/linux/linux-2.6.38/poodle/defconfig
+++ b/recipes/linux/linux-2.6.38/poodle/defconfig
@@ -171,7 +171,7 @@ CONFIG_KEYBOARD_LOCOMO=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ADS7846=y
 CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_UINPUT=y
 # CONFIG_SERIO is not set
 CONFIG_SERIAL_8250=m
 CONFIG_SERIAL_8250_CS=m
diff --git a/recipes/linux/linux-2.6.38/spitz/defconfig b/recipes/linux/linux-2.6.38/spitz/defconfig
index 0ad3bfe..f8ceafc 100644
--- a/recipes/linux/linux-2.6.38/spitz/defconfig
+++ b/recipes/linux/linux-2.6.38/spitz/defconfig
@@ -170,7 +170,7 @@ CONFIG_KEYBOARD_MATRIX=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ADS7846=y
 CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_UINPUT=y
 # CONFIG_SERIO is not set
 CONFIG_SERIAL_8250=m
 CONFIG_SERIAL_8250_CS=m
diff --git a/recipes/linux/linux-2.6.38/tosa/defconfig b/recipes/linux/linux-2.6.38/tosa/defconfig
index 4c8c3f9..c7aefa5 100644
--- a/recipes/linux/linux-2.6.38/tosa/defconfig
+++ b/recipes/linux/linux-2.6.38/tosa/defconfig
@@ -171,7 +171,7 @@ CONFIG_KEYBOARD_MATRIX=y
 # CONFIG_INPUT_MOUSE is not set
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_UINPUT=y
 # CONFIG_SERIO is not set
 CONFIG_SERIAL_8250=m
 CONFIG_SERIAL_8250_CS=m
diff --git a/recipes/linux/linux_2.6.38.bb b/recipes/linux/linux_2.6.38.bb
index 7160d14..54ad1d5 100644
--- a/recipes/linux/linux_2.6.38.bb
+++ b/recipes/linux/linux_2.6.38.bb
@@ -1,6 +1,6 @@
 require linux.inc
 
-PR = "r4"
+PR = "r3"
 
 # Mark archs/machines that this kernel supports
 DEFAULT_PREFERENCE = "-1"