fix broken patch.

[openwrt.git] / target / linux / magicbox / config-default

diff --git a/target/linux/magicbox/config-default b/target/linux/magicbox/config-default
index d63e83d..133a805 100644 (file)
--- a/target/linux/magicbox/config-default
+++ b/target/linux/magicbox/config-default
@@ -5,7 +5,6 @@ CONFIG_4xx=y
 # CONFIG_6xx is not set
 # CONFIG_8139TOO is not set
 # CONFIG_8xx is not set
 # CONFIG_6xx is not set
 # CONFIG_8139TOO is not set
 # CONFIG_8xx is not set

-# CONFIG_ACCESSIBILITY is not set

 # CONFIG_ADVANCED_OPTIONS is not set
 # CONFIG_AGP is not set
 CONFIG_ARCH_HAS_ILOG2_U32=y
 # CONFIG_ADVANCED_OPTIONS is not set
 # CONFIG_AGP is not set
 CONFIG_ARCH_HAS_ILOG2_U32=y


@@ -16,11 +15,10 @@ CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_BASE_SMALL=0
 CONFIG_BIOS_FIXUP=y
 CONFIG_BITREVERSE=y
 CONFIG_BASE_SMALL=0
 CONFIG_BIOS_FIXUP=y
 CONFIG_BITREVERSE=y

-# CONFIG_BLK_DEV_HD_ONLY is not set

 CONFIG_BLK_DEV_IDE=m
 CONFIG_BLK_DEV_IDEDISK=m
 # CONFIG_BLK_DEV_IDEDMA is not set
 CONFIG_BLK_DEV_IDE=m
 CONFIG_BLK_DEV_IDEDISK=m
 # CONFIG_BLK_DEV_IDEDMA is not set

-CONFIG_BLK_DEV_MAGICBOX_IDE=y
+CONFIG_BLK_DEV_MAGICBOX_IDE=m

 # CONFIG_BOOKE_WDT is not set
 CONFIG_BOOT_LOAD=0x00400000
 CONFIG_BOUNCE=y
 # CONFIG_BOOKE_WDT is not set
 CONFIG_BOOT_LOAD=0x00400000
 CONFIG_BOUNCE=y


@@ -33,9 +31,6 @@ CONFIG_CONSISTENT_SIZE=0x00200000
 CONFIG_CONSISTENT_START=0xff100000
 # CONFIG_CPCI405 is not set
 # CONFIG_CPU_FREQ is not set
 CONFIG_CONSISTENT_START=0xff100000
 # CONFIG_CPCI405 is not set
 # CONFIG_CPU_FREQ is not set

-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_GF128MUL=m

 # CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEVPORT=y
 # CONFIG_DMADEVICES is not set
 # CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEVPORT=y
 # CONFIG_DMADEVICES is not set


@@ -82,13 +77,9 @@ CONFIG_ISA_DMA_API=y
 CONFIG_KERNEL_START=0xc0000000
 # CONFIG_LEDS_ALIX is not set
 CONFIG_LOWMEM_SIZE=0x30000000
 CONFIG_KERNEL_START=0xc0000000
 # CONFIG_LEDS_ALIX is not set
 CONFIG_LOWMEM_SIZE=0x30000000

-CONFIG_LZO_COMPRESS=m
-CONFIG_LZO_DECOMPRESS=m

 # CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_MAGICBOX=y
 # CONFIG_MACINTOSH_DRIVERS is not set
 CONFIG_MAGICBOX=y

-CONFIG_MATH_EMULATION=y
-# CONFIG_MEDIA_ATTACH is not set
-# CONFIG_MEMSTICK is not set
+# CONFIG_MATH_EMULATION is not set

 CONFIG_MTD=y
 # CONFIG_MTD_ABSENT is not set
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD=y
 # CONFIG_MTD_ABSENT is not set
 CONFIG_MTD_BLKDEVS=y


@@ -173,7 +164,6 @@ CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SERIAL_8250_EXTENDED is not set
 # CONFIG_SERIAL_TEXT_DEBUG is not set
 CONFIG_SCSI_WAIT_SCAN=m
 # CONFIG_SERIAL_8250_EXTENDED is not set
 # CONFIG_SERIAL_TEXT_DEBUG is not set

-CONFIG_SLABINFO=y

 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SOUND is not set
 # CONFIG_SPARSEMEM_STATIC is not set
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SOUND is not set
 # CONFIG_SPARSEMEM_STATIC is not set


@@ -188,9 +178,7 @@ CONFIG_UART0_TTYS0=y
 # CONFIG_UART0_TTYS1 is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set
 # CONFIG_UART0_TTYS1 is not set
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set

-CONFIG_VIDEO_ALLOW_V4L1=y

 CONFIG_VIDEO_MEDIA=m
 CONFIG_VIDEO_MEDIA=m

-CONFIG_VIDEO_V4L1=m

 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_COMMON=m
 # CONFIG_WALNUT is not set
 CONFIG_VIDEO_V4L2=m
 CONFIG_VIDEO_V4L2_COMMON=m
 # CONFIG_WALNUT is not set