diff options
| author | Thomas Kunze <thommycheck@gmx.de> | 2008-03-28 20:32:50 +0000 |
|---|---|---|
| committer | Thomas Kunze <thommycheck@gmx.de> | 2008-03-28 20:32:50 +0000 |
| commit | 776b29a0062679bf6a48861c4753404649305a5e (patch) | |
| tree | 5d6db5e18fb9fbafceec30b6ba624c1a68db197d | |
| parent | f8cb0f2943e604d4001c4cc0171e32b27eafcd6a (diff) | |
| parent | e71da1c7ea82cc1b8795f2363cfb7943eb0c69cc (diff) | |
merge of '84875aef79b13e95114cd19f24c98b10531b29a7'
and 'cfb7d5ebc09f125eccc955d0f2a4c525cf083f94'
| -rw-r--r-- | conf/machine/include/zaurus-2.6.inc | 3 | ||||
| -rw-r--r-- | packages/keymaps/files/collie/keymap-2.6.map | 3 | ||||
| -rw-r--r-- | packages/keymaps/keymaps_1.0.bb | 2 | ||||
| -rw-r--r-- | packages/linux/linux-rp-2.6.24/defconfig-collie | 4 | ||||
| -rw-r--r-- | packages/linux/linux-rp.inc | 3 |
5 files changed, 8 insertions, 7 deletions
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 80deffebd8..c7e6d46872 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -33,7 +33,8 @@ MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz kernel-module-px MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz" MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia" MACHINE_EXTRA_RRECOMMENDS_collie = "kernel-module-locomo-spi kernel-module-sa1100-cs kernel-module-mmc-block \ - kernel-module-collie-ts kernel-module-leds-locomo kernel-module-locomokbd kernel-module-mmc-spi" + kernel-module-collie-ts kernel-module-leds-locomo kernel-module-locomokbd kernel-module-mmc-spi \ + kernel-module-power" GUI_MACHINE_CLASS = "bigscreen" GUI_MACHINE_CLASS_collie = "smallscreen" diff --git a/packages/keymaps/files/collie/keymap-2.6.map b/packages/keymaps/files/collie/keymap-2.6.map index 13eb7d2881..8a5f34af1c 100644 --- a/packages/keymaps/files/collie/keymap-2.6.map +++ b/packages/keymaps/files/collie/keymap-2.6.map @@ -154,7 +154,8 @@ keycode 57 = space control keycode 57 = nul shiftl control keycode 57 = grave control shiftr keycode 57 = grave -keycode 67 = Control +keycode 67 = Control +keycode 87 = Return keycode 99 = Control_backslash control keycode 99 = Control_backslash keycode 100 = AltGr diff --git a/packages/keymaps/keymaps_1.0.bb b/packages/keymaps/keymaps_1.0.bb index dd10b64099..c4d22d4b13 100644 --- a/packages/keymaps/keymaps_1.0.bb +++ b/packages/keymaps/keymaps_1.0.bb @@ -3,7 +3,7 @@ SECTION = "base" RDEPENDS = "initscripts console-tools" LICENSE = "GPL" PACKAGE_ARCH = "${MACHINE}" -PR = "r18" +PR = "r19" inherit update-rc.d diff --git a/packages/linux/linux-rp-2.6.24/defconfig-collie b/packages/linux/linux-rp-2.6.24/defconfig-collie index 91f09dff49..b4b1e114d9 100644 --- a/packages/linux/linux-rp-2.6.24/defconfig-collie +++ b/packages/linux/linux-rp-2.6.24/defconfig-collie @@ -857,8 +857,8 @@ CONFIG_SSB_POSSIBLE=y CONFIG_MCP=y CONFIG_MCP_SA11X0=y CONFIG_MCP_UCB1200=y -CONFIG_MCP_UCB1200_TS=m -# CONFIG_MCP_COLLIE_TS is not set +# CONFIG_MCP_UCB1200_TS is not set +CONFIG_MCP_COLLIE_TS=m # # Multimedia devices diff --git a/packages/linux/linux-rp.inc b/packages/linux/linux-rp.inc index a45ae9f2a2..43747f358d 100644 --- a/packages/linux/linux-rp.inc +++ b/packages/linux/linux-rp.inc @@ -63,8 +63,7 @@ module_autoload_locomokbd_collie = "locomokbd" module_autoload_sa1100-cs_collie = "sa1100_cs" module_autoload_collie-ts_collie = "collie-ts" module_autoload_leds-locomo_collie = "leds-locomo" -module_autoload_unix_collie = "unix" - +module_autoload_power_collie = "power" do_configure() { rm -f ${S}/.config |