--- trunk/kernel26-magellan/config-2.6.31-magellan-r1-i686	2009/10/13 18:11:04	891
+++ trunk/kernel26-magellan/config-2.6.31-magellan-r1-i686	2009/10/13 18:34:52	892
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.31
-# Tue Oct 13 20:06:23 2009
+# Linux kernel version: 2.6.31-magellan-r1
+# Tue Oct 13 20:41:24 2009
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -297,9 +297,6 @@
 CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 # CONFIG_X86_CPU_DEBUG is not set
-# CONFIG_NOHIGHMEM is not set
-# CONFIG_HIGHMEM4G is not set
-# CONFIG_HIGHMEM64G is not set
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_DIRECT_GBPAGES=y
 # CONFIG_NUMA is not set
@@ -458,11 +455,6 @@
 # Bus options (PCI etc.)
 #
 CONFIG_PCI=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-# CONFIG_PCI_GOOLPC is not set
-# CONFIG_PCI_GOANY is not set
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_MMCONFIG=y
 CONFIG_PCI_DOMAINS=y
@@ -3740,6 +3732,9 @@
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
 CONFIG_ECRYPT_FS=m
+CONFIG_UNION_FS=m
+CONFIG_UNION_FS_XATTR=y
+# CONFIG_UNION_FS_DEBUG is not set
 CONFIG_HFS_FS=m
 CONFIG_HFSPLUS_FS=m
 # CONFIG_BEFS_FS is not set