[oe-commits] Steffen Sledz : linux-2.6.24: disable 2nd SATA port (hipox machine only)

[git version control]

Module: openembedded.git
Branch: sledz/maintenance
Commit: 3d1ab6b9afc42472acdb0836b965c3c9ffa12a1f
URL:    http://git.openembedded.org/?p=openembedded.git&a=commit;h=3d1ab6b9afc42472acdb0836b965c3c9ffa12a1f

Author: Steffen Sledz <sledz at dresearch-fe.de>
Date:   Thu May 12 07:23:25 2011 +0000

linux-2.6.24: disable 2nd SATA port (hipox machine only)

The 2nd SATA port is not used at hipox machine and causes emission problems
if activated.

Signed-off-by: Steffen Sledz <sledz at dresearch-fe.de>

---

 recipes/linux/linux-2.6.24/hipox/defconfig |    4 ++--
 recipes/linux/linux_2.6.24.bb              |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes/linux/linux-2.6.24/hipox/defconfig b/recipes/linux/linux-2.6.24/hipox/defconfig
index 955423c..b22fc2b 100644
--- a/recipes/linux/linux-2.6.24/hipox/defconfig
+++ b/recipes/linux/linux-2.6.24/hipox/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.24.7
-# Thu Feb  3 15:28:12 2011
+# Wed May 11 14:11:43 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -644,7 +644,7 @@ CONFIG_ATA=m
 # CONFIG_SATA_VITESSE is not set
 # CONFIG_SATA_INIC162X is not set
 CONFIG_SATA_OX810=m
-# CONFIG_SATA_HIPOX_SINGLE_SATA is not set
+CONFIG_SATA_HIPOX_SINGLE_SATA=y
 # CONFIG_SATA_HIPOX_DISK_LIGHT is not set
 # CONFIG_PATA_ALI is not set
 # CONFIG_PATA_AMD is not set
diff --git a/recipes/linux/linux_2.6.24.bb b/recipes/linux/linux_2.6.24.bb
index 121a8c3..55c11c6 100644
--- a/recipes/linux/linux_2.6.24.bb
+++ b/recipes/linux/linux_2.6.24.bb
@@ -11,7 +11,7 @@ DEFAULT_PREFERENCE_hipox = "1"
 DEFAULT_PREFERENCE_cs-e9302 = "1"
 DEFAULT_PREFERENCE_smartq5 = "1"
 
-PR = "r39"
+PR = "r40"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \
            ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.7.bz2;apply=yes;name=stablepatch \