summaryrefslogtreecommitdiff
path: root/packages/linux/linux-openzaurus-2.6.16
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-06-15 14:43:40 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-06-15 14:43:40 +0000
commit59dd32c83d45a68ffd97331bf473b849960f7863 (patch)
tree1e846b7668f2cfdef1631a1e71d182189a2fd54f /packages/linux/linux-openzaurus-2.6.16
parentbc03091e3e838c63b8b28342144b5abd0119f10a (diff)
linux-oz-2.6: Rearrange patches to reflect submission status. Minor tweaks to make the defconfigs more equal. Update git kernel to a more recent version of the kernel.
Diffstat (limited to 'packages/linux/linux-openzaurus-2.6.16')
-rw-r--r--packages/linux/linux-openzaurus-2.6.16/defconfig-ipaq-pxa2705
-rw-r--r--packages/linux/linux-openzaurus-2.6.16/defconfig-qemuarm5
-rw-r--r--packages/linux/linux-openzaurus-2.6.16/defconfig-tosa2
-rw-r--r--packages/linux/linux-openzaurus-2.6.16/locomo-kbd-hotkeys.patch8
-rw-r--r--packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch17
5 files changed, 5 insertions, 32 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-ipaq-pxa270 b/packages/linux/linux-openzaurus-2.6.16/defconfig-ipaq-pxa270
index d6e3558456..2b1299116c 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-ipaq-pxa270
+++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-ipaq-pxa270
@@ -205,7 +205,7 @@ CONFIG_BINFMT_ELF=y
# 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
@@ -627,8 +627,7 @@ CONFIG_SERIAL_PXA_CONSOLE=y
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_LEGACY_PTYS is not set
#
# IPMI
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-qemuarm b/packages/linux/linux-openzaurus-2.6.16/defconfig-qemuarm
index 2d896af0e6..a12c7f4302 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-qemuarm
+++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-qemuarm
@@ -221,7 +221,7 @@ CONFIG_BINFMT_ELF=y
# Power management options
#
CONFIG_PM=y
-CONFIG_PM_LEGACY=y
+# CONFIG_PM_LEGACY is not set
# CONFIG_PM_DEBUG is not set
# CONFIG_APM is not set
@@ -570,8 +570,7 @@ CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
CONFIG_SERIAL_CORE=y
CONFIG_SERIAL_CORE_CONSOLE=y
CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_LEGACY_PTYS is not set
#
# IPMI
diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa b/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa
index d09989c4dd..4302f47e15 100644
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa
+++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-tosa
@@ -230,7 +230,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
diff --git a/packages/linux/linux-openzaurus-2.6.16/locomo-kbd-hotkeys.patch b/packages/linux/linux-openzaurus-2.6.16/locomo-kbd-hotkeys.patch
index 44a37dbc29..8b296780d4 100644
--- a/packages/linux/linux-openzaurus-2.6.16/locomo-kbd-hotkeys.patch
+++ b/packages/linux/linux-openzaurus-2.6.16/locomo-kbd-hotkeys.patch
@@ -46,11 +46,3 @@
};
#define KB_ROWS 16
-@@ -150,6 +155,7 @@
- for (row = 0; row < KB_ROWS; row++) {
- scancode = SCANCODE(col, row);
- if (rowd & KB_ROWMASK(row)) {
-+ /* printk(KERN_ERR "locomokbd: COL [%i] ROW [%i] scancode [%i] keycode [%i]\n",col,row,scancode,locomokbd->keycode[scancode]); */
- num_pressed += 1;
- input_report_key(locomokbd->input, locomokbd->keycode[scancode], 1);
- } else {
diff --git a/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch b/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch
index 94dabf4384..7e233277da 100644
--- a/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch
+++ b/packages/linux/linux-openzaurus-2.6.16/locomo-sysrq+keyrepeat.patch
@@ -47,20 +47,3 @@
#define LOCOMOKBD_PRESSED 1
struct locomokbd {
-@@ -146,6 +149,7 @@
- locomokbd_charge_all(membase);
-
- num_pressed = 0;
-+
- for (col = 0; col < KB_COLS; col++) {
-
- locomokbd_activate_col(membase, col);
-@@ -155,7 +159,7 @@
- for (row = 0; row < KB_ROWS; row++) {
- scancode = SCANCODE(col, row);
- if (rowd & KB_ROWMASK(row)) {
-- /* printk(KERN_ERR "locomokbd: COL [%i] ROW [%i] scancode [%i] keycode [%i]\n",col,row,scancode,locomokbd->keycode[scancode]); */
-+ /* printk(KERN_ERR "locomokbd: ROW [%i] COL [%i] scancode [%i] keycode [%i]\n",row,col,scancode,locomokbd->keycode[scancode]); */
- num_pressed += 1;
- input_report_key(locomokbd->input, locomokbd->keycode[scancode], 1);
- } else {