Config updated to the version from my computer

diff --git a/linux/.config b/linux/.config
index 0b09aae39205c456cf8614d6eb08e25766265834..d38c4a05d27ee75f6b2a725f90d580563d1bb4e7 100644 (file)
--- a/linux/.config
+++ b/linux/.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.18-1_AM
-# Fri Feb  2 22:48:59 2007
+# Wed Oct 15 09:47:55 2008
 #
 CONFIG_MMU=y
 CONFIG_GENERIC_HARDIRQS=y
@@ -165,6 +165,7 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE="console=ttyPSC0,38400 root=/dev/mtdblock2 rootfstype=jffs2"
+CONFIG_PSC3_IS_UART=y
 # CONFIG_PM is not set
 CONFIG_SECCOMP=y
 CONFIG_ISA_DMA_API=y
@@ -279,6 +280,20 @@ CONFIG_TCP_CONG_BIC=y
 # CONFIG_IRDA is not set
 # CONFIG_BT is not set
 # CONFIG_IEEE80211 is not set
+CONFIG_CAN=y
+CONFIG_CAN_RAW=y
+# CONFIG_CAN_RAW_USER is not set
+# CONFIG_CAN_BCM is not set
+# CONFIG_CAN_DEBUG_CORE is not set
+
+#
+# CAN Device Drivers
+#
+# CONFIG_CAN_VCAN is not set
+# CONFIG_CAN_DEBUG_DEVICES is not set
+# CONFIG_CAN_SJA1000 is not set
+CONFIG_CAN_MSCAN=y
+CONFIG_CAN_MPC52XX=y
 
 #
 # Device Drivers
@@ -357,6 +372,8 @@ CONFIG_MTD_REDBOOT=y
 #
 # Self-contained MTD device drivers
 #
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_M25P80 is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_MTDRAM is not set
@@ -569,8 +586,20 @@ CONFIG_HW_RANDOM=y
 #
 # SPI support
 #
-# CONFIG_SPI is not set
-# CONFIG_SPI_MASTER is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_BITBANG=y
+
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_MAX6629=y
+CONFIG_SPI_PROTOCOL=y
 
 #
 # Dallas's 1-wire bus
@@ -583,6 +612,7 @@ CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
 # CONFIG_SENSORS_ABITUGURU is not set
 # CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_LM70 is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #