[oe-commits] Koen Kooi : hawkboard, da850-omapl138-evm: fix SATA

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: fdaf5c66adbe3cd39a5a54c8163b70a8af8e8e1e
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=fdaf5c66adbe3cd39a5a54c8163b70a8af8e8e1e

Author: Koen Kooi <koen at openembedded.org>
Date:   Tue Jan  5 14:40:07 2010 +0100

hawkboard, da850-omapl138-evm: fix SATA

---

 conf/machine/include/davinci.inc                   |    2 +-
 .../linux-davinci/da850-omapl138-evm/defconfig     |    2 +-
 recipes/linux/linux-davinci/hawkboard/defconfig    |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index d4cacb9..bd8401a 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-arm926ejs.inc
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r30"
+MACHINE_KERNEL_PR = "r31"
 
 TARGET_ARCH = "arm"
 
diff --git a/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig b/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig
index 05bc1e7..c57ad71 100644
--- a/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig
+++ b/recipes/linux/linux-davinci/da850-omapl138-evm/defconfig
@@ -657,7 +657,7 @@ CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_SATA_PMP=y
+# CONFIG_SATA_PMP is not set
 CONFIG_SATA_AHCI=y
 # CONFIG_ATA_SFF is not set
 # CONFIG_MD is not set
diff --git a/recipes/linux/linux-davinci/hawkboard/defconfig b/recipes/linux/linux-davinci/hawkboard/defconfig
index 07bf563..1952db3 100644
--- a/recipes/linux/linux-davinci/hawkboard/defconfig
+++ b/recipes/linux/linux-davinci/hawkboard/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32-rc6
-# Thu Dec 17 14:57:56 2009
+# Tue Jan  5 14:21:28 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -672,7 +672,7 @@ CONFIG_SCSI_LOWLEVEL=y
 CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_SATA_PMP=y
+# CONFIG_SATA_PMP is not set
 CONFIG_SATA_AHCI=y
 # CONFIG_ATA_SFF is not set
 # CONFIG_MD is not set