fonera-mp3: fix json-c dependency here as well

[openwrt.git] / target / linux / at91-2.6 / config / default

diff --git a/target/linux/at91-2.6/config/default b/target/linux/at91-2.6/config/default
index d216039..5e74bd6 100644 (file)
--- a/target/linux/at91-2.6/config/default
+++ b/target/linux/at91-2.6/config/default
@@ -11,6 +11,7 @@ CONFIG_ARCH_AT91RM9200=y
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CO285 is not set
 # CONFIG_ARCH_CLPS711X is not set
 # CONFIG_ARCH_CLPS7500 is not set
 # CONFIG_ARCH_CO285 is not set

+# CONFIG_ARCH_DAVINCI is not set

 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set


@@ -26,6 +27,7 @@ CONFIG_ARCH_AT91RM9200=y
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP23XX is not set
 # CONFIG_ARCH_IXP4XX is not set

+# CONFIG_ARCH_KS8695 is not set

 # CONFIG_ARCH_L7200 is not set
 # CONFIG_ARCH_LH7A40X is not set
 # CONFIG_ARCH_NETX is not set
 # CONFIG_ARCH_L7200 is not set
 # CONFIG_ARCH_LH7A40X is not set
 # CONFIG_ARCH_NETX is not set


@@ -38,6 +40,7 @@ CONFIG_ARCH_AT91RM9200=y
 # CONFIG_ARCH_S3C2410 is not set
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_S3C2410 is not set
 # CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_SHARK is not set

+# CONFIG_ARCH_SUPPORTS_MSI is not set

 # CONFIG_ARCH_VERSATILE is not set
 CONFIG_ARM=y
 CONFIG_ARM_AT91_ETHER=y
 # CONFIG_ARCH_VERSATILE is not set
 CONFIG_ARM=y
 CONFIG_ARM_AT91_ETHER=y


@@ -47,8 +50,8 @@ CONFIG_ARM_THUMB=y
 # CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
 CONFIG_AT91_SPI=y
 # CONFIG_AT91_SPIDEV is not set
 # CONFIG_AT91_PROGRAMMABLE_CLOCKS is not set
 CONFIG_AT91_SPI=y
 # CONFIG_AT91_SPIDEV is not set

-CONFIG_AT91_VLIO=y

 # CONFIG_ATMEL_TCLIB is not set
 # CONFIG_ATMEL_TCLIB is not set

+CONFIG_ATM_DRIVERS=y

 # CONFIG_ATM_DUMMY is not set
 # CONFIG_ATM_TCP is not set
 CONFIG_BASE_SMALL=0
 # CONFIG_ATM_DUMMY is not set
 # CONFIG_ATM_TCP is not set
 CONFIG_BASE_SMALL=0


@@ -115,17 +118,18 @@ CONFIG_FPE_NWFPE=y
 # CONFIG_FPE_NWFPE_XP is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_FS_POSIX_ACL=y
 # CONFIG_FPE_NWFPE_XP is not set
 CONFIG_FRAME_POINTER=y
 CONFIG_FS_POSIX_ACL=y

-# CONFIG_FW_LOADER is not set
+CONFIG_FW_LOADER=m
+# CONFIG_GENERIC_CLOCKEVENTS is not set

 CONFIG_GENERIC_GPIO=y
 # CONFIG_GENERIC_TIME is not set
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_GENERIC_GPIO=y
 # CONFIG_GENERIC_TIME is not set
 CONFIG_HARDIRQS_SW_RESEND=y

+CONFIG_HAS_DMA=y

 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HID=y
 CONFIG_HW_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
 # CONFIG_I2C is not set
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HID=y
 CONFIG_HW_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
 # CONFIG_I2C is not set

-# CONFIG_IEEE80211 is not set

 # CONFIG_IKCONFIG is not set
 CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_IKCONFIG is not set
 CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_INITRAMFS_SOURCE=""


@@ -143,7 +147,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
 # CONFIG_IP6_NF_RAW is not set
 # CONFIG_IP6_NF_TARGET_HL is not set
 # CONFIG_IP6_NF_TARGET_LOG is not set
 # CONFIG_IP6_NF_RAW is not set
 # CONFIG_IP6_NF_TARGET_HL is not set
 # CONFIG_IP6_NF_TARGET_LOG is not set

-# CONFIG_IP_DCCP is not set

 # CONFIG_IP_NF_ARPTABLES is not set
 # CONFIG_IP_NF_MATCH_ADDRTYPE is not set
 # CONFIG_IP_NF_TARGET_LOG is not set
 # CONFIG_IP_NF_ARPTABLES is not set
 # CONFIG_IP_NF_MATCH_ADDRTYPE is not set
 # CONFIG_IP_NF_TARGET_LOG is not set


@@ -167,16 +170,16 @@ CONFIG_LEGACY_PTY_COUNT=32
 # CONFIG_MACH_KAFA is not set
 # CONFIG_MACH_KB9200 is not set
 # CONFIG_MACH_ONEARM is not set
 # CONFIG_MACH_KAFA is not set
 # CONFIG_MACH_KB9200 is not set
 # CONFIG_MACH_ONEARM is not set

-CONFIG_MACH_VLINK=y
+# CONFIG_MACH_PICOTUX2XX is not set

 CONFIG_MMC=m
 CONFIG_MMC_AT91=m
 CONFIG_MMC_BLOCK=m
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC=m
 CONFIG_MMC_AT91=m
 CONFIG_MMC_BLOCK=m
 # CONFIG_MMC_DEBUG is not set

+# CONFIG_MMC_UNSAFE_RESUME is not set

 CONFIG_MTD=y
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_AT91_DATAFLASH=y
 CONFIG_MTD=y
 # CONFIG_MTD_ABSENT is not set
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_AT91_DATAFLASH=y

-CONFIG_MTD_AT91_PARTS=y

 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_MTD_BLOCK2MTD is not set
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_MTD_BLOCK2MTD is not set


@@ -189,6 +192,7 @@ CONFIG_MTD_CHAR=y
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_CONCAT is not set
 CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_CONCAT is not set

+# CONFIG_MTD_DATAFLASH26 is not set

 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DEBUG is not set
 # CONFIG_MTD_DOC2000 is not set
 # CONFIG_MTD_DOC2001 is not set


@@ -201,7 +205,6 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
 # CONFIG_MTD_MTDRAM is not set
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
 # CONFIG_MTD_MTDRAM is not set

-# CONFIG_MTD_OBSOLETE_CHIPS is not set

 # CONFIG_MTD_ONENAND is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_ONENAND is not set
 CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_PHRAM is not set


@@ -209,18 +212,18 @@ CONFIG_MTD_PARTITIONS=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set

+# CONFIG_MTD_ROOTFS_ROOT_DEV is not set
+# CONFIG_MTD_ROOTFS_SPLIT is not set

 # CONFIG_MTD_SLRAM is not set
 # CONFIG_MTD_SLRAM is not set

-# CONFIG_MTD_SPLIT_ROOTFS is not set
+CONFIG_NETDEV_1000=y

 # CONFIG_NET_EMATCH is not set
 # CONFIG_NET_IPGRE_BROADCAST is not set
 # CONFIG_NET_PKTGEN is not set
 # CONFIG_NET_EMATCH is not set
 # CONFIG_NET_IPGRE_BROADCAST is not set
 # CONFIG_NET_PKTGEN is not set

-# CONFIG_NET_RADIO is not set

 CONFIG_NET_SCH_FIFO=y
 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NEW_LEDS is not set
 # CONFIG_NO_IDLE_HZ is not set
 # CONFIG_NO_IOPORT is not set
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_NET_SCH_NETEM is not set
 # CONFIG_NEW_LEDS is not set
 # CONFIG_NO_IDLE_HZ is not set
 # CONFIG_NO_IOPORT is not set

-# CONFIG_NTFS_FS is not set

 # CONFIG_NVRAM is not set
 # CONFIG_OUTER_CACHE is not set
 CONFIG_PHYLIB=y
 # CONFIG_NVRAM is not set
 # CONFIG_OUTER_CACHE is not set
 CONFIG_PHYLIB=y


@@ -233,6 +236,7 @@ CONFIG_PHYLIB=y
 CONFIG_RTC_LIB=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_SCSI_MULTI_LUN is not set
 CONFIG_RTC_LIB=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 # CONFIG_SCSI_MULTI_LUN is not set

+CONFIG_SCSI_WAIT_SCAN=m

 # CONFIG_SERIAL_8250 is not set
 CONFIG_SERIAL_ATMEL=y
 CONFIG_SERIAL_ATMEL_CONSOLE=y
 # CONFIG_SERIAL_8250 is not set
 CONFIG_SERIAL_ATMEL=y
 CONFIG_SERIAL_ATMEL_CONSOLE=y


@@ -248,12 +252,12 @@ CONFIG_SERIO_SERPORT=y
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y

+# CONFIG_TICK_ONESHOT is not set

 CONFIG_UID16=y
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
 # CONFIG_USB_ATM is not set
 # CONFIG_USB_CATC is not set
 CONFIG_UID16=y
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_USB_ARCH_HAS_EHCI is not set
 # CONFIG_USB_ATM is not set
 # CONFIG_USB_CATC is not set

-# CONFIG_USB_GTCO is not set

 # CONFIG_USB_KAWETH is not set
 CONFIG_USB_LIBUSUAL=y
 CONFIG_USB_MON=y
 # CONFIG_USB_KAWETH is not set
 CONFIG_USB_LIBUSUAL=y
 CONFIG_USB_MON=y


@@ -262,7 +266,6 @@ CONFIG_USB_MON=y
 CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_PRINTER is not set
 CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_PEGASUS is not set
 # CONFIG_USB_PRINTER is not set

-# CONFIG_USB_RTL8150 is not set

 # CONFIG_USB_SERIAL_EDGEPORT is not set
 # CONFIG_USB_SERIAL_EDGEPORT_TI is not set
 # CONFIG_USB_SERIAL_FUNSOFT is not set
 # CONFIG_USB_SERIAL_EDGEPORT is not set
 # CONFIG_USB_SERIAL_EDGEPORT_TI is not set
 # CONFIG_USB_SERIAL_FUNSOFT is not set


@@ -290,8 +293,8 @@ CONFIG_USB_OHCI_HCD=m
 # CONFIG_USB_STORAGE_USBAT is not set
 # CONFIG_USB_USBNET is not set
 # CONFIG_USB_USBNET_MII is not set
 # CONFIG_USB_STORAGE_USBAT is not set
 # CONFIG_USB_USBNET is not set
 # CONFIG_USB_USBNET_MII is not set

-# CONFIG_USB_YEALINK is not set

 CONFIG_VECTORS_BASE=0xffff0000
 CONFIG_VECTORS_BASE=0xffff0000

+# CONFIG_VGASTATE is not set

 # CONFIG_VGA_CONSOLE is not set
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_VGA_CONSOLE is not set
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y