[oe-commits] Dmitry Baryshkov : linux-rp-2.6.24: reenable ide-cs and ext3 on tosa

[GIT User account]

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

Author: Dmitry Baryshkov <dbaryshkov at gmail.com>
Date:   Tue Dec  9 00:36:40 2008 +0300

linux-rp-2.6.24: reenable ide-cs and ext3 on tosa

As we are now using kexecboot and thus aren't that constrained in terms
of kernel size, move ide-cs and ext3 back to kernel.

Signed-off-by: Dmitry Baryshkov <dbaryshkov at gmail.com>

---

 packages/linux/linux-rp-2.6.24/defconfig-tosa |   11 ++++-------
 packages/linux/linux-rp_2.6.24.bb             |    2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/packages/linux/linux-rp-2.6.24/defconfig-tosa b/packages/linux/linux-rp-2.6.24/defconfig-tosa
index 9c42d4b..d625475 100644
--- a/packages/linux/linux-rp-2.6.24/defconfig-tosa
+++ b/packages/linux/linux-rp-2.6.24/defconfig-tosa
@@ -655,7 +655,7 @@ CONFIG_BLK_DEV_IDE=y
 # CONFIG_BLK_DEV_IDE_SATA is not set
 CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_IDEDISK_MULTI_MODE is not set
-CONFIG_BLK_DEV_IDECS=m
+CONFIG_BLK_DEV_IDECS=y
 CONFIG_BLK_DEV_IDECD=m
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDEFLOPPY is not set
@@ -1460,13 +1460,10 @@ CONFIG_RTC_DRV_SA1100=y
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
 # CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_FS_XATTR=y
-# CONFIG_EXT3_FS_POSIX_ACL is not set
-# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_FS_XATTR is not set
 # CONFIG_EXT4DEV_FS is not set
-CONFIG_JBD=m
-CONFIG_FS_MBCACHE=y
+CONFIG_JBD=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
diff --git a/packages/linux/linux-rp_2.6.24.bb b/packages/linux/linux-rp_2.6.24.bb
index c498708..4b2db7e 100644
--- a/packages/linux/linux-rp_2.6.24.bb
+++ b/packages/linux/linux-rp_2.6.24.bb
@@ -1,6 +1,6 @@
 require linux-rp.inc
 
-PR = "r17"
+PR = "r18"
 
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_collie = "1"