[adm5120] refresh patches to match upstream style

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

diff --git a/target/linux/generic-2.6/config-2.6.24 b/target/linux/generic-2.6/config-2.6.24
index a6637c0..579df9f 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.24
+++ b/target/linux/generic-2.6/config-2.6.24
@@ -106,6 +106,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 # CONFIG_BLK_DEV_IDESCSI is not set
 # CONFIG_BLK_DEV_IDETAPE is not set
 # CONFIG_BLK_DEV_IDE_SATA is not set
+# CONFIG_BLK_DEV_IDE_SWARM is not set
 CONFIG_BLK_DEV_INITRD=y
 # CONFIG_BLK_DEV_IO_TRACE is not set
 # CONFIG_BLK_DEV_IT8213 is not set
@@ -425,6 +426,7 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_PIIX4 is not set
 # CONFIG_I2C_PROSAVAGE is not set
 # CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SIBYTE is not set
 # CONFIG_I2C_SIMTEC is not set
 # CONFIG_I2C_SIS5595 is not set
 # CONFIG_I2C_SIS630 is not set
@@ -691,7 +693,9 @@ CONFIG_JOLIET=y
 # CONFIG_LASAT is not set
 # CONFIG_LBD is not set
 # CONFIG_LDM_PARTITION is not set
+# CONFIG_LEDS_ALIX is not set
 CONFIG_LEDS_CLASS=y
+# CONFIG_LEDS_GPIO is not set
 CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
@@ -1007,6 +1011,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PATA_NETCELL is not set
 # CONFIG_PATA_NS87410 is not set
 # CONFIG_PATA_NS87415 is not set
+# CONFIG_PATA_OF_PLATFORM is not set
 # CONFIG_PATA_OLDPIIX is not set
 # CONFIG_PATA_OPTI is not set
 # CONFIG_PATA_OPTIDMA is not set
@@ -1027,7 +1032,7 @@ CONFIG_PATA_PLATFORM=m
 # CONFIG_PATA_WINBOND_VLB is not set
 # CONFIG_PC300TOO is not set
 # CONFIG_PCCARD is not set
-CONFIG_PCI=y
+# CONFIG_PCI is not set
 # CONFIG_PCI_ATMEL is not set
 CONFIG_PCI_HERMES=m
 # CONFIG_PCI_LEGACY is not set
@@ -1180,6 +1185,7 @@ CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_ISCSI_ATTRS is not set
 # CONFIG_SCSI_LOGGING is not set
 CONFIG_SCSI_LOWLEVEL=y
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 # CONFIG_SCSI_LPFC is not set
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_NCR53C406A is not set
@@ -1233,6 +1239,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
 # CONFIG_SENSORS_F71882FG is not set
 # CONFIG_SENSORS_F75375S is not set
 # CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCHMD is not set
 # CONFIG_SENSORS_FSCPOS is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
@@ -1502,7 +1509,7 @@ CONFIG_UNIX=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_UNIXWARE_DISKLABEL is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-CONFIG_USB=m
+# CONFIG_USB is not set
 # CONFIG_USB_ACECAD is not set
 CONFIG_USB_ACM=m
 # CONFIG_USB_ADUTUX is not set
@@ -1586,6 +1593,7 @@ CONFIG_USB_PEGASUS=m
 # CONFIG_USB_POWERMATE is not set
 CONFIG_USB_PRINTER=m
 # CONFIG_USB_QUICKCAM_MESSENGER is not set
+# CONFIG_USB_R8A66597_HCD is not set
 # CONFIG_USB_RIO500 is not set
 # CONFIG_USB_RTL8150 is not set
 # CONFIG_USB_SE401 is not set
@@ -1747,7 +1755,16 @@ CONFIG_VLAN_8021Q=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_VT is not set
 # CONFIG_VXFS_FS is not set
-# CONFIG_W1 is not set
+CONFIG_W1=m
+# CONFIG_W1_MASTER_DS1WM is not set
+# CONFIG_W1_MASTER_DS2482 is not set
+# CONFIG_W1_MASTER_DS2490 is not set
+# CONFIG_W1_MASTER_GPIO is not set
+# CONFIG_W1_MASTER_MATROX is not set
+# CONFIG_W1_SLAVE_DS2433 is not set
+# CONFIG_W1_SLAVE_DS2760 is not set
+# CONFIG_W1_SLAVE_SMEM is not set
+# CONFIG_W1_SLAVE_THERM is not set
 # CONFIG_W83627HF_WDT is not set
 # CONFIG_W83697HF_WDT is not set
 # CONFIG_W83877F_WDT is not set