s3c24xx: unbreak openmoko merge patch (mmc changes)

[openwrt.git] / target / linux / atheros / config-2.6.28

diff --git a/target/linux/atheros/config-2.6.28 b/target/linux/atheros/config-2.6.28
index b088e19..e55b52f 100644 (file)
--- a/target/linux/atheros/config-2.6.28
+++ b/target/linux/atheros/config-2.6.28
@@ -51,12 +51,12 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set
 # CONFIG_CPU_TX39XX is not set
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set

-CONFIG_CRYPTO_AEAD2=m
-CONFIG_CRYPTO_ALGAPI2=m
-CONFIG_CRYPTO_BLKCIPHER2=m
-CONFIG_CRYPTO_HASH2=m
-CONFIG_CRYPTO_MANAGER2=m
-CONFIG_CRYPTO_RNG2=m
+# CONFIG_CRYPTO_AEAD2 is not set
+# CONFIG_CRYPTO_ALGAPI2 is not set
+# CONFIG_CRYPTO_BLKCIPHER2 is not set
+# CONFIG_CRYPTO_HASH2 is not set
+# CONFIG_CRYPTO_MANAGER2 is not set
+# CONFIG_CRYPTO_RNG2 is not set

 CONFIG_CSRC_R4K=y
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
 CONFIG_CSRC_R4K=y
 CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set


@@ -171,7 +171,7 @@ CONFIG_MTD_REDBOOT_PARTS_READONLY=y
 CONFIG_MTD_SPIFLASH=y
 # CONFIG_NET_PCI is not set
 CONFIG_NF_CT_ACCT=y
 CONFIG_MTD_SPIFLASH=y
 # CONFIG_NET_PCI is not set
 CONFIG_NF_CT_ACCT=y

-CONFIG_NF_DEFRAG_IPV4=m
+# CONFIG_NF_DEFRAG_IPV4 is not set

 # CONFIG_NO_IOPORT is not set
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set
 # CONFIG_NO_IOPORT is not set
 # CONFIG_NXP_STB220 is not set
 # CONFIG_NXP_STB225 is not set


@@ -195,7 +195,7 @@ CONFIG_RFKILL_LEDS=y
 CONFIG_RTC_LIB=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_RTC_LIB=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

-CONFIG_SCSI_WAIT_SCAN=m
+# CONFIG_SCSI_WAIT_SCAN is not set

 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_NR_UARTS=1
 CONFIG_SERIAL_8250_RUNTIME_UARTS=1
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SERIAL_8250_NR_UARTS=1
 CONFIG_SERIAL_8250_RUNTIME_UARTS=1


@@ -222,14 +222,14 @@ CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_TRAD_SIGNALS=y
 CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 CONFIG_TICK_ONESHOT=y
 CONFIG_TRAD_SIGNALS=y

-CONFIG_USB=m
+# CONFIG_USB is not set

 # CONFIG_USB_EHCI_HCD is not set
 CONFIG_USB_STORAGE_CYPRESS_ATACB=y
 CONFIG_USB_SUPPORT=y
 # CONFIG_USB_UHCI_HCD is not set
 # CONFIG_USB_EHCI_HCD is not set
 CONFIG_USB_STORAGE_CYPRESS_ATACB=y
 CONFIG_USB_SUPPORT=y
 # CONFIG_USB_UHCI_HCD is not set

-CONFIG_USB_WDM=m
+# CONFIG_USB_WDM is not set

 # CONFIG_VGASTATE is not set
 # CONFIG_VGASTATE is not set

-CONFIG_VIDEO_MEDIA=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L2_COMMON=m
+# CONFIG_VIDEO_MEDIA is not set
+# CONFIG_VIDEO_V4L2 is not set
+# CONFIG_VIDEO_V4L2_COMMON is not set

 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_ZONE_DMA_FLAG=0