linux/3.3: show correct name for MIPS 24KEc in /proc/cpuinfo

[openwrt.git] / target / linux / generic / config-2.6.31

diff --git a/target/linux/generic/config-2.6.31 b/target/linux/generic/config-2.6.31
index e04adfe..ea54087 100644 (file)
--- a/target/linux/generic/config-2.6.31
+++ b/target/linux/generic/config-2.6.31
@@ -429,6 +429,7 @@ CONFIG_CRYPTO=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_KERNEL is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_DEBUG_KERNEL is not set

+# CONFIG_DEBUG_LOCKDEP is not set

 # CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUG_RODATA is not set
 # CONFIG_DEBUG_MEMORY_INIT is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_DEBUG_RODATA is not set


@@ -484,7 +485,7 @@ CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 # CONFIG_EEPROM_AT25 is not set
 # CONFIG_EEPROM_LEGACY is not set
 # CONFIG_EEPROM_MAX6875 is not set
 # CONFIG_EEPROM_AT25 is not set
 # CONFIG_EEPROM_LEGACY is not set
 # CONFIG_EEPROM_MAX6875 is not set

-# CONFIG_EFI_PARTITION is not set
+CONFIG_EFI_PARTITION=y

 # CONFIG_EFS_FS is not set
 # CONFIG_ELF_CORE is not set
 CONFIG_EMBEDDED=y
 # CONFIG_EFS_FS is not set
 # CONFIG_ELF_CORE is not set
 CONFIG_EMBEDDED=y


@@ -777,7 +778,7 @@ CONFIG_HZ_100=y
 # CONFIG_IDE_GD is not set
 CONFIG_IDE_MAX_HWIFS=4
 # CONFIG_IDE_PHISON is not set
 # CONFIG_IDE_GD is not set
 CONFIG_IDE_MAX_HWIFS=4
 # CONFIG_IDE_PHISON is not set

-CONFIG_IDE_PROC_FS=y
+# CONFIG_IDE_PROC_FS is not set

 # CONFIG_IDE_TASK_IOCTL is not set
 # CONFIG_IEEE1394 is not set
 # CONFIG_IEEE1394_DV1394 is not set
 # CONFIG_IDE_TASK_IOCTL is not set
 # CONFIG_IEEE1394 is not set
 # CONFIG_IEEE1394_DV1394 is not set


@@ -1468,6 +1469,7 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 # CONFIG_NF_CONNTRACK_SIP is not set
 CONFIG_NF_CONNTRACK_SUPPORT=y
 # CONFIG_NF_CONNTRACK_TFTP is not set
 # CONFIG_NF_CONNTRACK_SIP is not set
 CONFIG_NF_CONNTRACK_SUPPORT=y
 # CONFIG_NF_CONNTRACK_TFTP is not set

+# CONFIG_NF_CONNTRACK_ZONES is not set

 # CONFIG_NF_CT_ACCT is not set
 # CONFIG_NF_CT_NETLINK is not set
 # CONFIG_NF_CT_PROTO_DCCP is not set
 # CONFIG_NF_CT_ACCT is not set
 # CONFIG_NF_CT_NETLINK is not set
 # CONFIG_NF_CT_PROTO_DCCP is not set


@@ -1699,6 +1701,8 @@ CONFIG_PROC_FS=y
 # CONFIG_PROC_PAGE_MONITOR is not set
 CONFIG_PROC_SYSCTL=y
 # CONFIG_PROFILING is not set
 # CONFIG_PROC_PAGE_MONITOR is not set
 CONFIG_PROC_SYSCTL=y
 # CONFIG_PROFILING is not set

+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_PROVE_RCU is not set

 # CONFIG_QEMU is not set
 # CONFIG_QLA3XXX is not set
 # CONFIG_QNX4FS_FS is not set
 # CONFIG_QEMU is not set
 # CONFIG_QLA3XXX is not set
 # CONFIG_QNX4FS_FS is not set


@@ -2534,10 +2538,18 @@ CONFIG_USB_SERIAL_SAFE_PADDED=y
 # CONFIG_USB_SPEEDTOUCH is not set
 # CONFIG_USB_STKWEBCAM is not set
 # CONFIG_USB_STORAGE is not set
 # CONFIG_USB_SPEEDTOUCH is not set
 # CONFIG_USB_STKWEBCAM is not set
 # CONFIG_USB_STORAGE is not set

+# CONFIG_USB_STORAGE_ALAUDA is not set
+# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set

 # CONFIG_USB_STORAGE_DEBUG is not set
 # CONFIG_USB_STORAGE_DEBUG is not set

-CONFIG_USB_STORAGE_DPCM=y
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_KARMA is not set

 # CONFIG_USB_STORAGE_ONETOUCH is not set
 # CONFIG_USB_STORAGE_ONETOUCH is not set

-# CONFIG_USB_STORAGE_SIERRA is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_USBAT is not set

 # CONFIG_USB_STV06XX is not set
 # CONFIG_USB_STV680 is not set
 # CONFIG_USB_SUPPORT is not set
 # CONFIG_USB_STV06XX is not set
 # CONFIG_USB_STV680 is not set
 # CONFIG_USB_SUPPORT is not set