diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2005-11-29 12:22:22 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-11-29 12:22:22 +0000 |
| commit | a589c33513bd8f4860860b9803d8dc4fe5d6fde7 (patch) | |
| tree | 559e3905101cbd21a32bb3021343e9c656d280fd /packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2 | |
| parent | e10c2a138dcf536f472a80c97cc47592e43989b2 (diff) | |
| parent | ec5d818fc28befe7bd53cc77236eaf98b3f1bd0f (diff) | |
merge of 270dcdaefb593b358e63d5e0e0d535a802f790fd
and dac65a99f38ac6da3e7c8ece44938ffd7aad88c4
Diffstat (limited to 'packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2')
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-c7x0 | 3 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-cxx00 | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-c7x0 index 20b44b7197..0f42642e7f 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-c7x0 +++ b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-c7x0 @@ -228,7 +228,7 @@ CONFIG_BINFMT_MISC=m # Power management options # CONFIG_PM=y -CONFIG_PM_LEGACY=y +# CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set CONFIG_APM=y @@ -840,6 +840,7 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set CONFIG_KEYBOARD_CORGI=y +# CONFIG_KEYBOARD_TOSA is not set # CONFIG_KEYBOARD_SPITZ is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set diff --git a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-cxx00 b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-cxx00 index b1748c9268..ad44de256e 100644 --- a/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-cxx00 +++ b/packages/linux/linux-openzaurus-2.6.14+2.6.15-rc2/defconfig-cxx00 @@ -216,7 +216,7 @@ CONFIG_BINFMT_MISC=m # Power management options # CONFIG_PM=y -CONFIG_PM_LEGACY=y +# CONFIG_PM_LEGACY is not set # CONFIG_PM_DEBUG is not set CONFIG_APM=y @@ -829,6 +829,7 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_CORGI is not set CONFIG_KEYBOARD_SPITZ=y +# CONFIG_KEYBOARD_TOSA is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set CONFIG_INPUT_TOUCHSCREEN=y |