[pkg-fso-commits] [SCM] linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko branch, andy-tracking, updated. upstream/20090303.gitb9de904e-140-g23b564c

[Nelson Castillo]

The following commit has been merged in the andy-tracking branch:
commit 065c0049e3cf229ca0ce1fac4de6056857030593
Author: Nelson Castillo <arhuaco at freaks-unidos.net>
Date:   Mon Apr 20 01:33:29 2009 -0500

    Disable EXT4 / enable reiserfs
    
    Disable EXT4 in gta02_moredrivers_defconfig.
    Enable reiserfs3 in gta02_moredrivers_defconfig and gta02_packaging_defconfig.
    
    Signed-off-by: Nelson Castillo <arhuaco at freaks-unidos.net>
    Reported-by: W.Kenworthy <billk at iinet.net.au>

diff --git a/arch/arm/configs/gta02_moredrivers_defconfig b/arch/arm/configs/gta02_moredrivers_defconfig
index 94698ad..a664520 100644
--- a/arch/arm/configs/gta02_moredrivers_defconfig
+++ b/arch/arm/configs/gta02_moredrivers_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.29-rc3
-# Tue Feb 24 02:11:01 2009
+# Sun Apr 19 23:22:38 2009
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -204,6 +204,7 @@ CONFIG_S3C_GPIO_SPACE=0
 CONFIG_S3C_GPIO_TRACK=y
 CONFIG_S3C_DMA=y
 CONFIG_S3C_PWM=y
+CONFIG_S3C_DEV_USB_HOST=y
 
 #
 # S3C2400 Machines
@@ -1029,8 +1030,8 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_CM109 is not set
 CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF50633_PMU=y
 CONFIG_INPUT_LIS302DL=y
+CONFIG_INPUT_PCF50633_PMU=y
 
 #
 # Hardware I/O ports
@@ -1800,17 +1801,13 @@ CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
-CONFIG_EXT4_FS=y
-CONFIG_EXT4DEV_COMPAT=y
-CONFIG_EXT4_FS_XATTR=y
-# CONFIG_EXT4_FS_POSIX_ACL is not set
-CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_FS is not set
 CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
-CONFIG_JBD2=y
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=y
-# CONFIG_REISERFS_FS is not set
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
 # CONFIG_JFS_FS is not set
 # CONFIG_FS_POSIX_ACL is not set
 CONFIG_FILE_LOCKING=y
diff --git a/arch/arm/configs/gta02_packaging_defconfig b/arch/arm/configs/gta02_packaging_defconfig
index 29da627..b2bdae8 100644
--- a/arch/arm/configs/gta02_packaging_defconfig
+++ b/arch/arm/configs/gta02_packaging_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.29-rc3
-# Tue Feb 24 02:12:40 2009
+# Sun Apr 19 22:57:25 2009
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -204,6 +204,7 @@ CONFIG_S3C_GPIO_SPACE=0
 CONFIG_S3C_GPIO_TRACK=y
 CONFIG_S3C_DMA=y
 CONFIG_S3C_PWM=y
+CONFIG_S3C_DEV_USB_HOST=y
 
 #
 # S3C2400 Machines
@@ -1032,8 +1033,8 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_YEALINK is not set
 # CONFIG_INPUT_CM109 is not set
 CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_PCF50633_PMU=y
 CONFIG_INPUT_LIS302DL=y
+CONFIG_INPUT_PCF50633_PMU=y
 
 #
 # Hardware I/O ports
@@ -1806,7 +1807,10 @@ CONFIG_EXT3_FS=y
 # CONFIG_EXT4_FS is not set
 CONFIG_JBD=y
 # CONFIG_JBD_DEBUG is not set
-# CONFIG_REISERFS_FS is not set
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
 CONFIG_FILE_LOCKING=y
@@ -1887,7 +1891,6 @@ CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
 # CONFIG_NFS_V4 is not set
-CONFIG_ROOT_NFS=y
 CONFIG_NFSD=m
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y

-- 
linux-2.6-openmoko, the Linux 2.6 kernel tree from Openmoko