diff options
| author | Rod Whitby <rod@whitby.id.au> | 2005-07-26 04:10:51 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-26 04:10:51 +0000 |
| commit | 51e73263221b22ddf7c47fde1e731bc26fe388f9 (patch) | |
| tree | 7975e2053086a20c4cc8d3ffd7c00f5a6f38e7a2 /packages/linux | |
| parent | b353ee375fa7edc6d95c8a702874c7b793b3ed68 (diff) | |
| parent | 7f57c20dc7dfc8e395156c2bc4179be4b08cdeef (diff) | |
propagate from branch 'org.openembedded.dev' (head bec0de74737047dc066359246d921fbf51339c6e)
to branch 'org.openembedded.nslu2-linux' (head 9df4aaab2b771f04a318a53fd0e050ec07eb9f1b)
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/nslu2-kernel_2.6.12.2.bb | 2 | ||||
| -rw-r--r-- | packages/linux/openslug-kernel-2.6.12.2/defconfig | 37 |
2 files changed, 35 insertions, 4 deletions
diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb index 6fbb5d02ae..d72015c29a 100644 --- a/packages/linux/nslu2-kernel_2.6.12.2.bb +++ b/packages/linux/nslu2-kernel_2.6.12.2.bb @@ -1,5 +1,5 @@ # Kernel for NSLU2 -PR = "r3" +PR = "r4" include nslu2-kernel.inc # N2K_EXTRA_PATCHES - list of patches to apply (can include diff --git a/packages/linux/openslug-kernel-2.6.12.2/defconfig b/packages/linux/openslug-kernel-2.6.12.2/defconfig index eb5be45af5..ba3744e2f5 100644 --- a/packages/linux/openslug-kernel-2.6.12.2/defconfig +++ b/packages/linux/openslug-kernel-2.6.12.2/defconfig @@ -618,12 +618,30 @@ CONFIG_NETCONSOLE=m # # Input device support # -# CONFIG_INPUT is not set +CONFIG_INPUT=m + +# +# Userland interfaces +# +CONFIG_INPUT_MOUSEDEV=n +# CONFIG_INPUT_JOYDEV is not set +# CONFIG_INPUT_TSDEV is not set +# CONFIG_INPUT_EVDEV is not set +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=n +CONFIG_INPUT_MOUSE=n +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set # # Hardware I/O ports # -# CONFIG_SERIO is not set +CONFIG_SERIO=n # CONFIG_GAMEPORT is not set # @@ -903,11 +921,24 @@ CONFIG_USB_STORAGE=y # # USB Input Devices # -# CONFIG_USB_HID is not set +CONFIG_USB_HID=m +CONFIG_USB_HIDINPUT=y +# CONFIG_HID_FF is not set +CONFIG_USB_HIDDEV=y # # USB HID Boot Protocol drivers # +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# CONFIG_USB_AIPTEK is not set +# CONFIG_USB_WACOM is not set +# CONFIG_USB_KBTAB is not set +# CONFIG_USB_POWERMATE is not set +# CONFIG_USB_MTOUCH is not set +# CONFIG_USB_EGALAX is not set +# CONFIG_USB_XPAD is not set +# CONFIG_USB_ATI_REMOTE is not set # # USB Imaging devices |