From 6b52f40b6fffc90e689db9e52be53c69bba37d9c Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Thu, 14 Dec 2006 21:00:41 +0000
Subject: linux-rp: qemux86 touchscreen changes to work with wacom tablet

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1041 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/linux/linux-rp-2.6.17/defconfig-qemux86 | 17 +++++++----------
 meta/packages/linux/linux-rp_2.6.17.bb                |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/meta/packages/linux/linux-rp-2.6.17/defconfig-qemux86 b/meta/packages/linux/linux-rp-2.6.17/defconfig-qemux86
index fb66874b90..a1b9531acc 100644
--- a/meta/packages/linux/linux-rp-2.6.17/defconfig-qemux86
+++ b/meta/packages/linux/linux-rp-2.6.17/defconfig-qemux86
@@ -39,7 +39,7 @@ CONFIG_INITRAMFS_SOURCE=""
 CONFIG_UID16=y
 CONFIG_VM86=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-# CONFIG_EMBEDDED is not set
+CONFIG_EMBEDDED=y
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_EXTRA_PASS is not set
 CONFIG_HOTPLUG=y
@@ -812,13 +812,10 @@ CONFIG_INPUT=y
 #
 # Userland interfaces
 #
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_JOYDEV is not set
 # CONFIG_INPUT_TSDEV is not set
-# CONFIG_INPUT_EVDEV is not set
+CONFIG_INPUT_EVDEV=y
 # CONFIG_INPUT_EVBUG is not set
 # CONFIG_INPUT_POWER is not set
 
@@ -831,8 +828,8 @@ CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_NEWTON is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_MOUSE_PS2 is not set
 # CONFIG_MOUSE_SERIAL is not set
 # CONFIG_MOUSE_INPORT is not set
 # CONFIG_MOUSE_LOGIBM is not set
@@ -1224,7 +1221,7 @@ CONFIG_USB_EHCI_HCD=y
 # CONFIG_USB_EHCI_SPLIT_ISO is not set
 # CONFIG_USB_EHCI_ROOT_HUB_TT is not set
 # CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_OHCI_HCD is not set
+CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_UHCI_HCD=y
 # CONFIG_USB_SL811_HCD is not set
 
@@ -1263,7 +1260,7 @@ CONFIG_USB_HIDINPUT=y
 # CONFIG_HID_FF is not set
 # CONFIG_USB_HIDDEV is not set
 # CONFIG_USB_AIPTEK is not set
-# CONFIG_USB_WACOM is not set
+CONFIG_USB_WACOM=y
 # CONFIG_USB_ACECAD is not set
 # CONFIG_USB_KBTAB is not set
 # CONFIG_USB_POWERMATE is not set
diff --git a/meta/packages/linux/linux-rp_2.6.17.bb b/meta/packages/linux/linux-rp_2.6.17.bb
index fd2095ebfd..79e81f265d 100644
--- a/meta/packages/linux/linux-rp_2.6.17.bb
+++ b/meta/packages/linux/linux-rp_2.6.17.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r30"
+PR = "r32"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
-- 
cgit v1.2.3-54-g00ecf