From c6773c5e8a4f31738fe2d2e55354115bad8d6dd2 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 29 Jun 2005 20:12:43 +0000 Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages 2005/06/29 22:09:12+02:00 uni-frankfurt.de!mickeyl Disable the in-kernel orinoco drivers in openzaurus-pxa27x BKrev: 42c300bbdB9pCu3HSiXSb-f-Dt8KEQ --- .../openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/defconfig-akita | 4 ++-- .../openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/defconfig-spitz | 4 ++-- packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/defconfig-akita b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/defconfig-akita index 4fe39cf151..0df598d8a8 100644 --- a/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/defconfig-akita +++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/defconfig-akita @@ -535,8 +535,8 @@ CONFIG_NET_RADIO=y # CONFIG_AIRONET4500 is not set # CONFIG_AIRONET4500_NONCS is not set # CONFIG_AIRONET4500_PROC is not set -CONFIG_HERMES=y -CONFIG_PCMCIA_HERMES=y +# CONFIG_HERMES is not set +# CONFIG_PCMCIA_HERMES is not set # CONFIG_AIRO_CS is not set CONFIG_NET_WIRELESS=y diff --git a/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/defconfig-spitz b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/defconfig-spitz index e98bd2d2f2..7da6775e2b 100644 --- a/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/defconfig-spitz +++ b/packages/linux/openzaurus-pxa27x-2.4.20-rmk2-embedix20050228/defconfig-spitz @@ -534,8 +534,8 @@ CONFIG_NET_RADIO=y # CONFIG_AIRONET4500 is not set # CONFIG_AIRONET4500_NONCS is not set # CONFIG_AIRONET4500_PROC is not set -CONFIG_HERMES=y -CONFIG_PCMCIA_HERMES=y +# CONFIG_HERMES is not set +# CONFIG_PCMCIA_HERMES is not set # CONFIG_AIRO_CS is not set CONFIG_NET_WIRELESS=y diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb index e088b5bffb..3855300e31 100644 --- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb +++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050228.bb @@ -5,7 +5,7 @@ SECTION = "kernel" PV = "2.4.20-rmk2-embedix" LICENSE = "GPL" KV = "2.4.20" -PR = "r7" +PR = "r8" SRC_URI = "http://developer.ezaurus.com/sl_j/source/c1000/20050228/linux-c1000-20050228-rom1_01.tar.bz2 \ file://P01-C3000-clockup_050221.patch;pnum=2;patch=1 \ -- cgit 1.2.3-korg