linux-oz-2.6: Fix kernel-hostap RPROVIDES problem, enable KEXEC in defconfigs, make...

diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0
index 996fba9724e58f2c506a40d5ae7aa7b13a449b1b..669efab8b5d12144511bdc0c8632f3191b16ae70 100644 (file)
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0
+++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0
@@ -144,7 +144,7 @@ CONFIG_CPU_TLB_V4WBI=y
 #
 CONFIG_ARM_THUMB=y
 CONFIG_XSCALE_PMU=y
-# CONFIG_KEXEC is not set
+CONFIG_KEXEC=y
 CONFIG_SHARP_PARAM=y
 CONFIG_SHARPSL_PM=y
 CONFIG_SHARP_SCOOP=y

diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-cxx00 b/packages/linux/linux-openzaurus-2.6.16/defconfig-cxx00
index 794ff52a8845d0a561b3f873664d8cd4bbac65e2..eb56a0a7bc9aa03d5d33ab377c767a27a94527c6 100644 (file)
--- a/packages/linux/linux-openzaurus-2.6.16/defconfig-cxx00
+++ b/packages/linux/linux-openzaurus-2.6.16/defconfig-cxx00
@@ -143,7 +143,7 @@ CONFIG_CPU_TLB_V4WBI=y
 #
 CONFIG_ARM_THUMB=y
 CONFIG_XSCALE_PMU=y
-# CONFIG_KEXEC is not set
+CONFIG_KEXEC=y
 CONFIG_SHARP_PARAM=y
 CONFIG_SHARPSL_PM=y
 CONFIG_SHARP_SCOOP=y

diff --git a/packages/linux/linux-openzaurus.inc b/packages/linux/linux-openzaurus.inc
index 74edea8df8c3f1737eb2ed32ba48f5fe212bbbf6..531833278c4345ef0f47dc0d0509fc7a3aafd565 100644 (file)
--- a/packages/linux/linux-openzaurus.inc
+++ b/packages/linux/linux-openzaurus.inc
@@ -3,7 +3,7 @@ SECTION = "kernel"
 MAINTAINER = "Richard Purdie <rpurdie@rpsys.net>, Michael 'Mickey' Lauer <mickey@vanille.de>"
 LICENSE = "GPL"
 PROVIDES = "virtual/kernel-hostap"
-RPROVIDES = "virtual/kernel-hostap"
+RPROVIDES_kernel-module-hostap-cs = "virtual/kernel-hostap"
 
 DOSRC = "http://www.do13.de/openzaurus/patches"
 RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"

diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb
index 0cf048ed72883fe6d34629b317ad546463c025bf..f6095ba33aa724e96b9be6d150a895aa25cdbf1d 100644 (file)
--- a/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/packages/linux/linux-openzaurus_2.6.16.bb
@@ -1,8 +1,6 @@
 include linux-openzaurus.inc
 
-PR = "r4"
-
-DEFAULT_PREFERENCE = "-1"
+PR = "r5"
 
 # Handy URLs
 # git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \