diff options
| author | Rod Whitby <rod@whitby.id.au> | 2005-07-24 09:23:28 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-24 09:23:28 +0000 |
| commit | 0e4507a78da1a3e593de26a10f683cf7549f7fd8 (patch) | |
| tree | d010aa9d19d791146df3d54ac26560e22b5320c1 | |
| parent | f2e1da7559d1798ae8314d8824c8d53da0b3506b (diff) | |
| parent | 00e189f558429b6917f02a28eab2e08cf68c3e31 (diff) | |
merge of 7674b5cefa1bffe23d1d22a95d2a3e5632799f08
and 7f183da4475115f7bfd62b35a7c733fe4fd59258
| -rw-r--r-- | packages/linux/openslug-kernel-2.6.12.2/defconfig | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/packages/linux/openslug-kernel-2.6.12.2/defconfig b/packages/linux/openslug-kernel-2.6.12.2/defconfig index 3eba8afc45..eb5be45af5 100644 --- a/packages/linux/openslug-kernel-2.6.12.2/defconfig +++ b/packages/linux/openslug-kernel-2.6.12.2/defconfig @@ -151,7 +151,7 @@ CONFIG_ALIGNMENT_TRAP=y # CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc reboot=s console=ttyS0,115200n8" +CONFIG_CMDLINE="root=/dev/mtdblock4 rw rootfstype=jffs2 mem=32M@0x00000000 init=/linuxrc reboot=s noirqdebug console=ttyS0,115200n8" # CONFIG_XIP_KERNEL is not set # @@ -426,8 +426,14 @@ CONFIG_INET_ESP=m CONFIG_INET_IPCOMP=m CONFIG_INET_TUNNEL=m CONFIG_IP_TCPDIAG=m -# CONFIG_IP_TCPDIAG_IPV6 is not set -# CONFIG_IPV6 is not set +CONFIG_IP_TCPDIAG_IPV6=y +CONFIG_IPV6=m +# CONFIG_IPV6_PRIVACY is not set +CONFIG_INET6_AH=m +CONFIG_INET6_ESP=m +CONFIG_INET6_IPCOMP=m +CONFIG_INET6_TUNNEL=m +CONFIG_IPV6_TUNNEL=m # CONFIG_NETFILTER is not set CONFIG_XFRM=y # CONFIG_XFRM_USER is not set @@ -829,7 +835,17 @@ CONFIG_VIDEO_DEV=m # # Sound # -# CONFIG_SOUND is not set +CONFIG_SOUND=m + +# +# Advanced Linux Sound Architecture +# +# CONFIG_SND is not set + +# +# Open Sound System +# +# CONFIG_SOUND_PRIME is not set # # USB support @@ -862,10 +878,12 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y # # USB Device Class drivers # +CONFIG_USB_AUDIO=m # # USB Bluetooth TTY can only be used with disabled Bluetooth subsystem # +# CONFIG_USB_MIDI is not set CONFIG_USB_ACM=m CONFIG_USB_PRINTER=m |