[adm5120] refresh patches to match upstream style

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

diff --git a/target/linux/generic-2.6/config-2.6.22 b/target/linux/generic-2.6/config-2.6.22
index fac26eb..a09e0af 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.22
+++ b/target/linux/generic-2.6/config-2.6.22
@@ -19,9 +19,9 @@ CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARPD=y
 CONFIG_ASK_IP_FIB_HASH=y
 # CONFIG_ATA is not set
-# CONFIG_ATA_GENERIC is not set
 # CONFIG_ATALK is not set
 # CONFIG_ATARI_PARTITION is not set
+# CONFIG_ATA_GENERIC is not set
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_ATL1 is not set
 CONFIG_ATM=m
@@ -89,9 +89,14 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 # CONFIG_BLK_DEV_DAC960 is not set
 # CONFIG_BLK_DEV_DELKIN is not set
 # CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_HD is not set
+# CONFIG_BLK_DEV_HD_IDE is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
 # CONFIG_BLK_DEV_IDECD is not set
-# CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDECS is not set
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
 # CONFIG_BLK_DEV_IDEPCI is not set
 # CONFIG_BLK_DEV_IDEPNP is not set
 # CONFIG_BLK_DEV_IDESCSI is not set
@@ -112,6 +117,7 @@ CONFIG_BLK_DEV_NBD=m
 # CONFIG_BLK_DEV_PIIX is not set
 # CONFIG_BLK_DEV_RAM is not set
 # CONFIG_BLK_DEV_RZ1000 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
 CONFIG_BLK_DEV_SD=m
 # CONFIG_BLK_DEV_SIIMAGE is not set
 # CONFIG_BLK_DEV_SIS5513 is not set
@@ -124,6 +130,7 @@ CONFIG_BLK_DEV_SD=m
 # CONFIG_BLK_DEV_TRM290 is not set
 # CONFIG_BLK_DEV_UB is not set
 # CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
 CONFIG_BLOCK=y
 # CONFIG_BNX2 is not set
 CONFIG_BONDING=m
@@ -409,10 +416,12 @@ CONFIG_HZ_100=y
 # CONFIG_I2O is not set
 # CONFIG_I82092 is not set
 # CONFIG_ICPLUS_PHY is not set
-CONFIG_IDE_MAX_HWIFS=4
 # CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_IDEDMA_IVB is not set
+CONFIG_IDEPCI_SHARE_IRQ=y
+CONFIG_IDE_MAX_HWIFS=4
 CONFIG_IDE_PROC_FS=y
+# CONFIG_IDE_TASK_IOCTL is not set
 # CONFIG_IEEE1394 is not set
 CONFIG_IEEE80211=m
 CONFIG_IEEE80211_CRYPT_CCMP=m
@@ -549,8 +558,6 @@ CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_HASHLIMIT=m
 CONFIG_IP_NF_MATCH_IPP2P=m
 CONFIG_IP_NF_MATCH_IPRANGE=m
-CONFIG_IP_NF_MATCH_LAYER7=m
-# CONFIG_IP_NF_MATCH_LAYER7_DEBUG is not set
 CONFIG_IP_NF_MATCH_OWNER=m
 CONFIG_IP_NF_MATCH_RECENT=m
 CONFIG_IP_NF_MATCH_SET=m
@@ -654,9 +661,9 @@ CONFIG_JOLIET=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
-CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_LEDS_TRIGGER_IDE_DISK is not set
 # CONFIG_LEDS_TRIGGER_MORSE is not set
+CONFIG_LEDS_TRIGGER_TIMER=y
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_LIBCRC32C=m
 # CONFIG_LIBERTAS is not set
@@ -699,6 +706,7 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
 # CONFIG_MTD_NAND is not set
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 CONFIG_MTD_ROOTFS_ROOT_DEV=y
 CONFIG_MTD_ROOTFS_SPLIT=y
 # CONFIG_MTD_UBI is not set
@@ -735,6 +743,8 @@ CONFIG_NETFILTER_XT_MATCH_PORTSCAN=m
 CONFIG_NETFILTER_XT_MATCH_REALM=m
 CONFIG_NETFILTER_XT_MATCH_SCTP=m
 CONFIG_NETFILTER_XT_MATCH_STATE=y
+CONFIG_NETFILTER_XT_MATCH_LAYER7=m
+# CONFIG_NETFILTER_XT_MATCH_LAYER7_DEBUG is not set
 # CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
 CONFIG_NETFILTER_XT_MATCH_STRING=m
 CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
@@ -898,7 +908,7 @@ CONFIG_NLS_KOI8_R=m
 # CONFIG_NLS_KOI8_U is not set
 CONFIG_NLS_UTF8=m
 CONFIG_NORTEL_HERMES=m
-CONFIG_NO_HZ=y
+# CONFIG_NO_HZ is not set
 # CONFIG_NS83820 is not set
 # CONFIG_NTFS_DEBUG is not set
 # CONFIG_NTFS_FS is not set
@@ -975,6 +985,7 @@ CONFIG_PCI_HERMES=m
 # CONFIG_PCMCIA_WL3501 is not set
 # CONFIG_PCNET32 is not set
 # CONFIG_PD6729 is not set
+# CONFIG_PDC_ADMA is not set
 # CONFIG_PHANTOM is not set
 # CONFIG_PHONE is not set
 # CONFIG_PHYLIB is not set
@@ -1045,7 +1056,6 @@ CONFIG_RTC_DRV_CMOS=y
 CONFIG_RT_MUTEXES=y
 # CONFIG_S2IO is not set
 # CONFIG_SATA_AHCI is not set
-# CONFIG_PDC_ADMA is not set
 # CONFIG_SATA_INIC162X is not set
 # CONFIG_SATA_MV is not set
 # CONFIG_SATA_NV is not set
@@ -1206,6 +1216,7 @@ CONFIG_SLHC=m
 # CONFIG_SMB_FS is not set
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_SND=m
+# CONFIG_SND_AC97_POWER_SAVE is not set
 # CONFIG_SND_AD1816A is not set
 # CONFIG_SND_AD1848 is not set
 # CONFIG_SND_AD1889 is not set