From 414ced7d3fc227189da8a4fe6718fbb443c8c566 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 7 Apr 2006 09:49:29 +0000 Subject: linux-oz-2.6: Fix kernel-hostap RPROVIDES problem, enable KEXEC in defconfigs, make 2.6.16 the default kernel. --- packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 | 2 +- packages/linux/linux-openzaurus-2.6.16/defconfig-cxx00 | 2 +- packages/linux/linux-openzaurus.inc | 2 +- packages/linux/linux-openzaurus_2.6.16.bb | 4 +--- 4 files changed, 4 insertions(+), 6 deletions(-) (limited to 'packages/linux') diff --git a/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.16/defconfig-c7x0 index 996fba9724..669efab8b5 100644 --- 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 794ff52a88..eb56a0a7bc 100644 --- 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 74edea8df8..531833278c 100644 --- a/packages/linux/linux-openzaurus.inc +++ b/packages/linux/linux-openzaurus.inc @@ -3,7 +3,7 @@ SECTION = "kernel" MAINTAINER = "Richard Purdie , Michael 'Mickey' Lauer " 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 0cf048ed72..f6095ba33a 100644 --- 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 \ -- cgit v1.2.3