From: Mirko Vogt Date: Mon, 23 Feb 2009 20:23:11 +0000 (+0000) Subject: re-enable s3c24xx-specific sound modules to fix build of kmod-soundcore X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9ddd8dc2f08b4fe1765e60da36dd158d79c180d7;p=openwrt%2Fstaging%2Frobimarko.git re-enable s3c24xx-specific sound modules to fix build of kmod-soundcore SVN-Revision: 14646 --- diff --git a/target/linux/s3c24xx/config-2.6.28 b/target/linux/s3c24xx/config-2.6.28 index 87067c1b4e..418e72162f 100644 --- a/target/linux/s3c24xx/config-2.6.28 +++ b/target/linux/s3c24xx/config-2.6.28 @@ -67,8 +67,6 @@ CONFIG_ARM_THUMB=y # CONFIG_ARTHUR is not set CONFIG_ASHMEM=y CONFIG_ATAGS_PROC=y -# CONFIG_ATA_OVER_ETH is not set -# CONFIG_ATM is not set CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_CORGI=y CONFIG_BACKLIGHT_LCD_SUPPORT=y @@ -79,20 +77,14 @@ CONFIG_BATTERY_BQ27000_HDQ=y # CONFIG_BATTERY_DS2760 is not set # CONFIG_BINFMT_AOUT is not set CONFIG_BITREVERSE=y -# CONFIG_BLK_DEV_NBD is not set CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 -# CONFIG_BLK_DEV_SD is not set # CONFIG_BLK_DEV_XIP is not set -# CONFIG_BONDING is not set -# CONFIG_BRIDGE_EBT_NFLOG is not set CONFIG_BRIDGE_NETFILTER=y # CONFIG_BSD_DISKLABEL is not set # CONFIG_BSD_PROCESS_ACCT is not set -# CONFIG_BT is not set CONFIG_CHARGER_PCF50633=y -# CONFIG_CIFS is not set CONFIG_CLASSIC_RCU=y CONFIG_CMDLINE="unused -- bootloader passes ATAG list" CONFIG_COMPAT_BRK=y @@ -122,7 +114,6 @@ CONFIG_CPU_S3C244X=y CONFIG_CPU_TLB_V4WBI=y CONFIG_CRC16=y CONFIG_CRC_CCITT=y -# CONFIG_CRC_ITU_T is not set CONFIG_CRC_T10DIF=y CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_AES=y @@ -135,22 +126,17 @@ CONFIG_CRYPTO_BLKCIPHER2=y CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_ECB=y -# CONFIG_CRYPTO_FCRYPT is not set CONFIG_CRYPTO_FIPS=y -# CONFIG_CRYPTO_GF128MUL is not set CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y -# CONFIG_CRYPTO_LRW is not set CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_MD5=y -# CONFIG_CRYPTO_PCBC is not set CONFIG_CRYPTO_RNG=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_SHA1=y -# CONFIG_CRYPTO_XCBC is not set CONFIG_DAB=y CONFIG_DEBUG_BUGVERBOSE=y # CONFIG_DEBUG_FS is not set @@ -162,12 +148,9 @@ CONFIG_DISPLAY_JBT6K74=y CONFIG_DISPLAY_SUPPORT=y CONFIG_DMADEVICES=y CONFIG_DUMMY_CONSOLE=y -# CONFIG_EEPROM_93CX6 is not set CONFIG_ELF_CORE=y # CONFIG_EMBEDDED is not set # CONFIG_ENABLE_WARN_DEPRECATED is not set -# CONFIG_EXT2_FS is not set -# CONFIG_EXT3_FS is not set CONFIG_FB=y # CONFIG_FB_BACKLIGHT is not set # CONFIG_FB_BOOT_VESA_SUPPORT is not set @@ -218,8 +201,6 @@ CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y # CONFIG_GENERIC_TIME is not set CONFIG_GPIOLIB=y CONFIG_GPIO_DEVICE=y -# CONFIG_GPIO_MAX7301 is not set -# CONFIG_GPIO_MAX732X is not set CONFIG_GPIO_SYSFS=y CONFIG_GTA02_HDQ=y # CONFIG_HAMRADIO is not set @@ -237,8 +218,6 @@ CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_LATENCYTOP_SUPPORT=y CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_PWM=y -# CONFIG_HFSPLUS_FS is not set -# CONFIG_HFS_FS is not set CONFIG_HID=y CONFIG_HID_A4TECH=y CONFIG_HID_APPLE=y @@ -271,7 +250,6 @@ CONFIG_I2C_CHARDEV=y CONFIG_I2C_HELPER_AUTO=y CONFIG_I2C_S3C2410=y # CONFIG_IDE is not set -# CONFIG_IEEE80211 is not set CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_INET_DIAG=y @@ -292,30 +270,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=480 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=640 CONFIG_INPUT_PCF50633_PMU=y CONFIG_INPUT_TOUCHSCREEN=y -# CONFIG_INPUT_UINPUT is not set # CONFIG_INPUT_YEALINK is not set -# CONFIG_IOSCHED_AS is not set -# CONFIG_IOSCHED_CFQ is not set -# CONFIG_IP6_NF_MANGLE is not set -# CONFIG_IP6_NF_MATCH_EUI64 is not set -# CONFIG_IP6_NF_MATCH_FRAG is not set -# CONFIG_IP6_NF_MATCH_HL is not set -# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set -# CONFIG_IP6_NF_MATCH_OPTS is not set -# CONFIG_IP6_NF_MATCH_RT is not set -# CONFIG_IP6_NF_QUEUE is not set -# CONFIG_IP6_NF_RAW is not set -# CONFIG_IP6_NF_TARGET_LOG is not set -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IP_NF_MATCH_ADDRTYPE is not set -# CONFIG_IP_NF_MATCH_ECN is not set -# CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_RAW is not set -# CONFIG_IP_NF_TARGET_ECN is not set -# CONFIG_IP_NF_TARGET_LOG is not set -# CONFIG_IP_NF_TARGET_REDIRECT is not set -# CONFIG_IP_NF_TARGET_TTL is not set -# CONFIG_IP_NF_TARGET_ULOG is not set CONFIG_IP_PNP=y # CONFIG_IP_PNP_BOOTP is not set # CONFIG_IP_PNP_DHCP is not set @@ -323,7 +278,6 @@ CONFIG_IP_PNP=y # CONFIG_IP_ROUTE_MULTIPATH is not set # CONFIG_IP_ROUTE_VERBOSE is not set # CONFIG_ISDN is not set -# CONFIG_ISO9660_FS is not set # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set CONFIG_KALLSYMS=y CONFIG_KEXEC=y @@ -351,7 +305,6 @@ CONFIG_LEDS_NEO1973_VIBRATOR=y CONFIG_LEDS_TRIGGER_BACKLIGHT=y # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set -# CONFIG_LLC2 is not set CONFIG_LOCK_KERNEL=y # CONFIG_LOGIRUMBLEPAD2_FF is not set # CONFIG_LOGITECH_FF is not set @@ -392,7 +345,6 @@ CONFIG_MFD_PCF50633=y # CONFIG_MFD_TC6387XB is not set # CONFIG_MFD_TC6393XB is not set # CONFIG_MFD_TMIO is not set -# CONFIG_MINIX_FS is not set CONFIG_MMC=y CONFIG_MMC_BLOCK=y CONFIG_MMC_BLOCK_BOUNCE=y @@ -408,7 +360,6 @@ CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MOUSE_PS2 is not set # CONFIG_MOUSE_SERIAL is not set # CONFIG_MOUSE_VSXXXAA is not set -# CONFIG_MSDOS_FS is not set CONFIG_MTD=y CONFIG_MTD_ABSENT=y # CONFIG_MTD_AFS_PARTS is not set @@ -468,64 +419,13 @@ CONFIG_MTD_ROM=y CONFIG_NAMESPACES=y # CONFIG_NEO1973_GTA02_2440 is not set # CONFIG_NETDEV_1000 is not set -# CONFIG_NETFILTER_NETLINK is not set -# CONFIG_NETFILTER_NETLINK_LOG is not set -# CONFIG_NETFILTER_NETLINK_QUEUE is not set -# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set -# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set -# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set -# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set -# CONFIG_NETFILTER_XT_MATCH_HELPER is not set -# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set -# CONFIG_NETFILTER_XT_MATCH_OWNER is not set -# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set -# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set -# CONFIG_NETFILTER_XT_MATCH_STATE is not set -# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set -# CONFIG_NETFILTER_XT_MATCH_TIME is not set -# CONFIG_NETFILTER_XT_MATCH_U32 is not set -# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set -# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set -# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set # CONFIG_NET_CLS_ACT is not set -# CONFIG_NET_CLS_FLOW is not set -# CONFIG_NET_CLS_IND is not set # CONFIG_NET_ETHERNET is not set -# CONFIG_NET_IPGRE_BROADCAST is not set -# CONFIG_NET_IPIP is not set -CONFIG_NET_KEY_MIGRATE=y -# CONFIG_NET_PKTGEN is not set -# CONFIG_NET_SCH_NETEM is not set -# CONFIG_NFSD is not set -# CONFIG_NFS_FS is not set CONFIG_NF_CONNTRACK=y -# CONFIG_NF_CONNTRACK_AMANDA is not set -# CONFIG_NF_CONNTRACK_FTP is not set -# CONFIG_NF_CONNTRACK_H323 is not set CONFIG_NF_CONNTRACK_IPV4=y -# CONFIG_NF_CONNTRACK_IRC is not set # CONFIG_NF_CONNTRACK_MARK is not set -# CONFIG_NF_CONNTRACK_PPTP is not set # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set -# CONFIG_NF_CONNTRACK_SIP is not set -# CONFIG_NF_CONNTRACK_TFTP is not set CONFIG_NF_DEFRAG_IPV4=y -# CONFIG_NF_NAT_AMANDA is not set -# CONFIG_NF_NAT_FTP is not set -# CONFIG_NF_NAT_H323 is not set -# CONFIG_NF_NAT_IRC is not set -# CONFIG_NF_NAT_PPTP is not set -# CONFIG_NF_NAT_SIP is not set -# CONFIG_NF_NAT_SNMP_BASIC is not set -# CONFIG_NF_NAT_TFTP is not set -CONFIG_NLS=y -# CONFIG_NLS_CODEPAGE_1250 is not set -# CONFIG_NLS_CODEPAGE_437 is not set -# CONFIG_NLS_CODEPAGE_850 is not set -# CONFIG_NLS_ISO8859_1 is not set -# CONFIG_NLS_ISO8859_15 is not set -# CONFIG_NLS_KOI8_R is not set -# CONFIG_NLS_UTF8 is not set CONFIG_NO_IOPORT=y CONFIG_NR_TTY_DEVICES=6 # CONFIG_NVRAM is not set @@ -546,7 +446,6 @@ CONFIG_PM=y CONFIG_PM_SLEEP=y CONFIG_POWER_SUPPLY=y CONFIG_POWER_SUPPLY_DEBUG=y -# CONFIG_PPP is not set CONFIG_PREEMPT=y CONFIG_PROC_PAGE_MONITOR=y CONFIG_REGULATOR=y @@ -558,7 +457,6 @@ CONFIG_RFKILL_LEDS=y CONFIG_RTC_CLASS=y CONFIG_RTC_DEBUG=y # CONFIG_RTC_DRV_CMOS is not set -# CONFIG_RTC_DRV_DS1305 is not set # CONFIG_RTC_DRV_DS1307 is not set # CONFIG_RTC_DRV_DS1374 is not set # CONFIG_RTC_DRV_DS1553 is not set @@ -566,7 +464,6 @@ CONFIG_RTC_DEBUG=y # CONFIG_RTC_DRV_DS1742 is not set # CONFIG_RTC_DRV_ISL1208 is not set # CONFIG_RTC_DRV_M41T80 is not set -# CONFIG_RTC_DRV_M41T94 is not set # CONFIG_RTC_DRV_M48T59 is not set # CONFIG_RTC_DRV_M48T86 is not set # CONFIG_RTC_DRV_PCF50606 is not set @@ -609,7 +506,7 @@ CONFIG_SCSI=y # CONFIG_SCSI_LOWLEVEL is not set # CONFIG_SCSI_MULTI_LUN is not set # CONFIG_SCSI_PROC_FS is not set -# CONFIG_SCSI_WAIT_SCAN is not set +CONFIG_SCSI_WAIT_SCAN=m # CONFIG_SDIO_UART is not set # CONFIG_SENSORS_PCF50606 is not set # CONFIG_SENSORS_PCF50633 is not set @@ -625,25 +522,27 @@ CONFIG_SERIO=y # CONFIG_SERIO_SERPORT is not set CONFIG_SMDK2440_CPU2440=y CONFIG_SMDK2440_CPU2442=y -CONFIG_SND_ARM=y +CONFIG_SND=m +# CONFIG_SND_ARM is not set # CONFIG_SND_DRIVERS is not set -# CONFIG_SND_HWDEP is not set -# CONFIG_SND_MIXER_OSS is not set -# CONFIG_SND_PCM_OSS is not set -# CONFIG_SND_S3C24XX_SOC is not set -# CONFIG_SND_S3C24XX_SOC_I2S is not set +CONFIG_SND_PCM=m +CONFIG_SND_S3C24XX_SOC=m +CONFIG_SND_S3C24XX_SOC_I2S=m # CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set -# CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753 is not set -# CONFIG_SND_SOC is not set +CONFIG_SND_S3C24XX_SOC_NEO1973_GTA02_WM8753=m +CONFIG_SND_SOC=m # CONFIG_SND_SOC_ALL_CODECS is not set -# CONFIG_SND_SOC_WM8753 is not set +CONFIG_SND_SOC_WM8753=m +CONFIG_SND_TIMER=m # CONFIG_SND_USB is not set # CONFIG_SND_VERBOSE_PROCFS is not set # CONFIG_SOFT_WATCHDOG is not set +CONFIG_SOUND=m # CONFIG_SOUND_OSS_CORE is not set CONFIG_SPI=y CONFIG_SPI_BITBANG=y # CONFIG_SPI_GPIO is not set +# CONFIG_SPI_GPIO_OLD is not set CONFIG_SPI_MASTER=y CONFIG_SPI_S3C24XX=y CONFIG_SPI_S3C24XX_GPIO=y @@ -660,7 +559,6 @@ CONFIG_SYS_SUPPORTS_APM_EMULATION=y # CONFIG_TCP_CONG_ADVANCED is not set CONFIG_TCP_CONG_CUBIC=y CONFIG_TCP_MD5SIG=y -# CONFIG_THRUSTMASTER_FF is not set # CONFIG_TOUCHSCREEN_ADS7846 is not set # CONFIG_TOUCHSCREEN_ELO is not set CONFIG_TOUCHSCREEN_FILTER=y @@ -681,8 +579,6 @@ CONFIG_TOUCHSCREEN_S3C2410=y # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set # CONFIG_TOUCHSCREEN_TOUCHWIN is not set # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set -# CONFIG_TUN is not set -# CONFIG_UDF_FS is not set CONFIG_UID16=y CONFIG_UIO=y CONFIG_UIO_PDRV=y @@ -694,7 +590,6 @@ CONFIG_USB=y CONFIG_USB_ACM=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y # CONFIG_USB_ARCH_HAS_EHCI is not set -# CONFIG_USB_CATC is not set # CONFIG_USB_CDC_COMPOSITE is not set # CONFIG_USB_DEVICEFS is not set CONFIG_USB_ETH=y @@ -724,79 +619,31 @@ CONFIG_USB_GADGET_VBUS_DRAW=500 # CONFIG_USB_G_PRINTER is not set # CONFIG_USB_G_SERIAL is not set CONFIG_USB_HID=y -# CONFIG_USB_HSO is not set -# CONFIG_USB_KAWETH is not set # CONFIG_USB_MIDI_GADGET is not set # CONFIG_USB_MUSB_HDRC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set CONFIG_USB_OHCI_HCD=y -# CONFIG_USB_PEGASUS is not set -# CONFIG_USB_PRINTER is not set CONFIG_USB_S3C2410=y # CONFIG_USB_S3C2410_DEBUG is not set CONFIG_USB_SERIAL=y -# CONFIG_USB_SERIAL_AIRCABLE is not set -# CONFIG_USB_SERIAL_ARK3116 is not set -# CONFIG_USB_SERIAL_BELKIN is not set -# CONFIG_USB_SERIAL_CH341 is not set CONFIG_USB_SERIAL_CONSOLE=y -# CONFIG_USB_SERIAL_CP2101 is not set -# CONFIG_USB_SERIAL_CYBERJACK is not set -# CONFIG_USB_SERIAL_CYPRESS_M8 is not set -# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set -# CONFIG_USB_SERIAL_EDGEPORT is not set -# CONFIG_USB_SERIAL_EDGEPORT_TI is not set -# CONFIG_USB_SERIAL_EMPEG is not set -# CONFIG_USB_SERIAL_FTDI_SIO is not set -# CONFIG_USB_SERIAL_FUNSOFT is not set -# CONFIG_USB_SERIAL_GARMIN is not set -# CONFIG_USB_SERIAL_HP4X is not set -# CONFIG_USB_SERIAL_IPAQ is not set -# CONFIG_USB_SERIAL_IPW is not set -# CONFIG_USB_SERIAL_IR is not set -# CONFIG_USB_SERIAL_IUU is not set -# CONFIG_USB_SERIAL_KEYSPAN is not set -# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set -# CONFIG_USB_SERIAL_KLSI is not set -# CONFIG_USB_SERIAL_KOBIL_SCT is not set -# CONFIG_USB_SERIAL_MCT_U232 is not set -# CONFIG_USB_SERIAL_MOS7720 is not set -# CONFIG_USB_SERIAL_MOS7840 is not set -# CONFIG_USB_SERIAL_NAVMAN is not set -# CONFIG_USB_SERIAL_OMNINET is not set CONFIG_USB_SERIAL_OPTION=y -# CONFIG_USB_SERIAL_OTI6858 is not set -# CONFIG_USB_SERIAL_PL2303 is not set -# CONFIG_USB_SERIAL_SAFE is not set -# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set -# CONFIG_USB_SERIAL_TI is not set -# CONFIG_USB_SERIAL_VISOR is not set -# CONFIG_USB_SERIAL_WHITEHEAT is not set -# CONFIG_USB_SERIAL_XIRCOM is not set -# CONFIG_USB_STORAGE is not set CONFIG_USB_SUPPORT=y CONFIG_USB_SUSPEND=y -# CONFIG_USB_USBNET is not set # CONFIG_USB_ZERO is not set # CONFIG_USER_NS is not set CONFIG_VECTORS_BASE=0xffff0000 -# CONFIG_VFAT_FS is not set # CONFIG_VGASTATE is not set # CONFIG_VGA_CONSOLE is not set -# CONFIG_VIDEO_DEV is not set CONFIG_VIDEO_OUTPUT_CONTROL=y # CONFIG_VLAN_8021Q is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y -# CONFIG_W1 is not set # CONFIG_WIRELESS_OLD_REGULATORY is not set # CONFIG_WLAN_80211 is not set -CONFIG_XFRM_MIGRATE=y -# CONFIG_XFRM_USER is not set CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 -# CONFIG_ZEROPLUS_FF is not set CONFIG_ZONE_DMA_FLAG=0