[ar7] resync kernel configuration

[openwrt.git] / target / linux / generic-2.6 / config-2.6.30

diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index 4feb9c8..d8b21f4 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -1,3 +1,13 @@
+# CONFIG_REDWOOD is not set
+# CONFIG_SIMPLE_GPIO is not set
+# CONFIG_PPC_16K_PAGES is not set
+# CONFIG_PPC_256K_PAGES is not set
+CONFIG_PPC_4K_PAGES=y
+# CONFIG_PPC_64K_PAGES is not set
+# CONFIG_PCIEASPM is not set
+# CONFIG_SERIAL_OF_PLATFORM_NWPSERIAL is not set
+# CONFIG_HVC_UDBG is not set
+CONFIG_STDBINUTILS=y

 # CONFIG_6PACK is not set
 # CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set
 # CONFIG_6PACK is not set
 # CONFIG_8139CP is not set
 # CONFIG_8139TOO is not set


@@ -175,6 +185,7 @@ CONFIG_BINFMT_ELF=y
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_BLK_DEV_INTEGRITY is not set
 # CONFIG_BLK_DEV_IO_TRACE is not set

+# CONFIG_BLK_DEV_IT8172 is not set

 # CONFIG_BLK_DEV_IT8213 is not set
 # CONFIG_BLK_DEV_IT821X is not set
 # CONFIG_BLK_DEV_JMICRON is not set
 # CONFIG_BLK_DEV_IT8213 is not set
 # CONFIG_BLK_DEV_IT821X is not set
 # CONFIG_BLK_DEV_JMICRON is not set


@@ -406,6 +417,7 @@ CONFIG_DEBUG_FS=y
 CONFIG_DEFAULT_DEADLINE=y
 # CONFIG_DEFAULT_HTCP is not set
 CONFIG_DEFAULT_IOSCHED="deadline"
 CONFIG_DEFAULT_DEADLINE=y
 # CONFIG_DEFAULT_HTCP is not set
 CONFIG_DEFAULT_IOSCHED="deadline"

+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096

 # CONFIG_DEFAULT_NOOP is not set
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="westwood"
 # CONFIG_DEFAULT_NOOP is not set
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="westwood"


@@ -548,10 +560,13 @@ CONFIG_HAMRADIO=y
 # CONFIG_HID_EZKEY is not set
 # CONFIG_HID_FF is not set
 # CONFIG_HID_GYRATION is not set
 # CONFIG_HID_EZKEY is not set
 # CONFIG_HID_FF is not set
 # CONFIG_HID_GYRATION is not set

+# CONFIG_HID_KENSINGTON is not set
+# CONFIG_HID_KYE is not set

 # CONFIG_HID is not set
 # CONFIG_HID_LOGITECH is not set
 # CONFIG_HID_MICROSOFT is not set
 # CONFIG_HID_MONTEREY is not set
 # CONFIG_HID is not set
 # CONFIG_HID_LOGITECH is not set
 # CONFIG_HID_MICROSOFT is not set
 # CONFIG_HID_MONTEREY is not set

+# CONFIG_HID_NTRIG is not set

 # CONFIG_HID_PANTHERLORD is not set
 # CONFIG_HID_PETALYNX is not set
 # CONFIG_HID_PID is not set
 # CONFIG_HID_PANTHERLORD is not set
 # CONFIG_HID_PETALYNX is not set
 # CONFIG_HID_PID is not set


@@ -560,6 +575,7 @@ CONFIG_HAMRADIO=y
 # CONFIG_HID_SONY is not set
 # CONFIG_HID_SUNPLUS is not set
 # CONFIG_HID_SUPPORT is not set
 # CONFIG_HID_SONY is not set
 # CONFIG_HID_SUNPLUS is not set
 # CONFIG_HID_SUPPORT is not set

+# CONFIG_HID_TOPSEED is not set

 # CONFIG_HIGHMEM is not set
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_HIPPI is not set
 # CONFIG_HIGHMEM is not set
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_HIPPI is not set


@@ -698,6 +714,8 @@ CONFIG_INET=y
 # CONFIG_INFINIBAND is not set
 # CONFIG_INFTL is not set
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_INFINIBAND is not set
 # CONFIG_INFTL is not set
 CONFIG_INIT_ENV_ARG_LIMIT=32

+# CONFIG_INITRAMFS_COMPRESSION_BZIP2 is not set
+# CONFIG_INITRAMFS_COMPRESSION_GZIP is not set

 # CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
 CONFIG_INITRAMFS_COMPRESSION_NONE=y
 # CONFIG_INOTIFY is not set
 # CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
 CONFIG_INITRAMFS_COMPRESSION_NONE=y
 # CONFIG_INOTIFY is not set


@@ -1120,17 +1138,15 @@ CONFIG_MTD=y
 # CONFIG_NET_ACT_MIRRED is not set
 # CONFIG_NET_ACT_NAT is not set
 # CONFIG_NET_ACT_PEDIT is not set
 # CONFIG_NET_ACT_MIRRED is not set
 # CONFIG_NET_ACT_NAT is not set
 # CONFIG_NET_ACT_PEDIT is not set

-CONFIG_NET_ACT_POLICE=y
+# CONFIG_NET_ACT_POLICE is not set

 # CONFIG_NET_ACT_SIMP is not set
 # CONFIG_NET_ACT_SIMP is not set

-# CONFIG_NET_ACT_SKBEDIT is not set
+CONFIG_NET_ACT_SKBEDIT=y

 CONFIG_NET_CLS_ACT=y
 CONFIG_NET_CLS_ACT=y

-# CONFIG_NET_CLS_BASIC is not set
+CONFIG_NET_CLS_BASIC=y

 # CONFIG_NET_CLS_FLOW is not set
 # CONFIG_NET_CLS_FW is not set
 CONFIG_NET_CLS_IND=y
 # CONFIG_NET_CLS_FLOW is not set
 # CONFIG_NET_CLS_FW is not set
 CONFIG_NET_CLS_IND=y

-CONFIG_NET_CLS_POLICE=y

 # CONFIG_NET_CLS_ROUTE4 is not set
 # CONFIG_NET_CLS_ROUTE4 is not set

-CONFIG_NET_CLS_ROUTE=y

 # CONFIG_NET_CLS_RSVP6 is not set
 # CONFIG_NET_CLS_RSVP is not set
 # CONFIG_NET_CLS_TCINDEX is not set
 # CONFIG_NET_CLS_RSVP6 is not set
 # CONFIG_NET_CLS_RSVP is not set
 # CONFIG_NET_CLS_TCINDEX is not set


@@ -1421,6 +1437,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PATA_RADISYS is not set
 # CONFIG_PATA_RZ1000 is not set
 # CONFIG_PATA_SC1200 is not set
 # CONFIG_PATA_RADISYS is not set
 # CONFIG_PATA_RZ1000 is not set
 # CONFIG_PATA_SC1200 is not set

+# CONFIG_PATA_SCH is not set

 # CONFIG_PATA_SERVERWORKS is not set
 # CONFIG_PATA_SIL680 is not set
 # CONFIG_PATA_SIS is not set
 # CONFIG_PATA_SERVERWORKS is not set
 # CONFIG_PATA_SIL680 is not set
 # CONFIG_PATA_SIS is not set


@@ -1865,6 +1882,7 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_HDSP is not set
 # CONFIG_SND_HDSPM is not set
 # CONFIG_SND_HIFIER is not set
 # CONFIG_SND_HDSP is not set
 # CONFIG_SND_HDSPM is not set
 # CONFIG_SND_HIFIER is not set

+# CONFIG_SND_HRTIMER is not set

 # CONFIG_SND_HWDEP is not set
 # CONFIG_SND_ICE1712 is not set
 # CONFIG_SND_ICE1724 is not set
 # CONFIG_SND_HWDEP is not set
 # CONFIG_SND_ICE1712 is not set
 # CONFIG_SND_ICE1724 is not set