wok-current diff linux/stuff/linux-2.6.30.6-slitaz.config @ rev 4475
Merge
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Mon Nov 09 21:55:05 2009 +0100 (2009-11-09) |
parents | 3681131f240a |
children | fd7196ef5021 |
line diff
1.1 --- a/linux/stuff/linux-2.6.30.6-slitaz.config Fri Sep 25 02:18:43 2009 +0200 1.2 +++ b/linux/stuff/linux-2.6.30.6-slitaz.config Mon Nov 09 21:55:05 2009 +0100 1.3 @@ -1,7 +1,7 @@ 1.4 # 1.5 # Automatically generated make config: don't edit 1.6 # Linux kernel version: 2.6.30.6 1.7 -# Fri Sep 25 01:17:11 2009 1.8 +# Fri Nov 6 10:51:41 2009 1.9 # 1.10 # CONFIG_64BIT is not set 1.11 CONFIG_X86_32=y 1.12 @@ -343,11 +343,11 @@ 1.13 CONFIG_ACPI_PROCFS_POWER=y 1.14 CONFIG_ACPI_SYSFS_POWER=y 1.15 CONFIG_ACPI_PROC_EVENT=y 1.16 -CONFIG_ACPI_AC=m 1.17 -CONFIG_ACPI_BATTERY=m 1.18 +CONFIG_ACPI_AC=y 1.19 +CONFIG_ACPI_BATTERY=y 1.20 # CONFIG_ACPI_BUTTON is not set 1.21 CONFIG_ACPI_VIDEO=m 1.22 -# CONFIG_ACPI_FAN is not set 1.23 +CONFIG_ACPI_FAN=y 1.24 CONFIG_ACPI_DOCK=y 1.25 CONFIG_ACPI_PROCESSOR=y 1.26 CONFIG_ACPI_HOTPLUG_CPU=y 1.27 @@ -376,8 +376,8 @@ 1.28 # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set 1.29 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y 1.30 CONFIG_CPU_FREQ_GOV_POWERSAVE=m 1.31 -CONFIG_CPU_FREQ_GOV_USERSPACE=m 1.32 -CONFIG_CPU_FREQ_GOV_ONDEMAND=m 1.33 +CONFIG_CPU_FREQ_GOV_USERSPACE=y 1.34 +CONFIG_CPU_FREQ_GOV_ONDEMAND=y 1.35 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m 1.36 1.37 # 1.38 @@ -939,7 +939,7 @@ 1.39 # CONFIG_PNPBIOS is not set 1.40 CONFIG_PNPACPI=y 1.41 CONFIG_BLK_DEV=y 1.42 -CONFIG_BLK_DEV_FD=y 1.43 +CONFIG_BLK_DEV_FD=m 1.44 # CONFIG_BLK_DEV_XD is not set 1.45 # CONFIG_PARIDE is not set 1.46 # CONFIG_BLK_CPQ_DA is not set 1.47 @@ -1272,7 +1272,7 @@ 1.48 # CONFIG_IEEE1394_ETH1394_ROM_ENTRY is not set 1.49 # CONFIG_IEEE1394_ETH1394 is not set 1.50 CONFIG_IEEE1394_RAWIO=m 1.51 -# CONFIG_IEEE1394_VIDEO1394 is not set 1.52 +CONFIG_IEEE1394_VIDEO1394=m 1.53 # CONFIG_IEEE1394_DV1394 is not set 1.54 # CONFIG_IEEE1394_VERBOSEDEBUG is not set 1.55 # CONFIG_I2O is not set 1.56 @@ -1378,7 +1378,7 @@ 1.57 CONFIG_ADAPTEC_STARFIRE=m 1.58 # CONFIG_AC3200 is not set 1.59 CONFIG_APRICOT=m 1.60 -CONFIG_B44=y 1.61 +CONFIG_B44=m 1.62 CONFIG_B44_PCI_AUTOSELECT=y 1.63 CONFIG_B44_PCICORE_AUTOSELECT=y 1.64 CONFIG_B44_PCI=y 1.65 @@ -1480,17 +1480,20 @@ 1.66 CONFIG_LIBIPW=m 1.67 # CONFIG_LIBIPW_DEBUG is not set 1.68 CONFIG_IWLWIFI=m 1.69 -# CONFIG_IWLWIFI_LEDS is not set 1.70 -# CONFIG_IWLWIFI_RFKILL is not set 1.71 +CONFIG_IWLWIFI_LEDS=y 1.72 +CONFIG_IWLWIFI_RFKILL=y 1.73 # CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set 1.74 # CONFIG_IWLWIFI_DEBUG is not set 1.75 -# CONFIG_IWLAGN is not set 1.76 +CONFIG_IWLAGN=m 1.77 +CONFIG_IWL4965=y 1.78 +CONFIG_IWL5000=y 1.79 CONFIG_IWL3945=m 1.80 CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y 1.81 # CONFIG_HOSTAP is not set 1.82 CONFIG_B43=m 1.83 CONFIG_B43_PCI_AUTOSELECT=y 1.84 CONFIG_B43_PCICORE_AUTOSELECT=y 1.85 +# CONFIG_B43_PCMCIA is not set 1.86 CONFIG_B43_LEDS=y 1.87 # CONFIG_B43_DEBUG is not set 1.88 CONFIG_B43LEGACY=m 1.89 @@ -1674,7 +1677,7 @@ 1.90 CONFIG_MOUSE_PS2_TRACKPOINT=y 1.91 # CONFIG_MOUSE_PS2_ELANTECH is not set 1.92 # CONFIG_MOUSE_PS2_TOUCHKIT is not set 1.93 -CONFIG_MOUSE_SERIAL=y 1.94 +CONFIG_MOUSE_SERIAL=m 1.95 # CONFIG_MOUSE_APPLETOUCH is not set 1.96 # CONFIG_MOUSE_BCM5974 is not set 1.97 CONFIG_MOUSE_INPORT=m 1.98 @@ -2085,11 +2088,13 @@ 1.99 # 1.100 # Sonics Silicon Backplane 1.101 # 1.102 -CONFIG_SSB=y 1.103 +CONFIG_SSB=m 1.104 CONFIG_SSB_SPROM=y 1.105 CONFIG_SSB_PCIHOST_POSSIBLE=y 1.106 CONFIG_SSB_PCIHOST=y 1.107 CONFIG_SSB_B43_PCI_BRIDGE=y 1.108 +CONFIG_SSB_PCMCIAHOST_POSSIBLE=y 1.109 +# CONFIG_SSB_PCMCIAHOST is not set 1.110 # CONFIG_SSB_DEBUG is not set 1.111 CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y 1.112 CONFIG_SSB_DRIVER_PCICORE=y 1.113 @@ -2502,7 +2507,8 @@ 1.114 CONFIG_SND_HDA_CODEC_CMEDIA=y 1.115 CONFIG_SND_HDA_CODEC_SI3054=y 1.116 CONFIG_SND_HDA_GENERIC=y 1.117 -# CONFIG_SND_HDA_POWER_SAVE is not set 1.118 +CONFIG_SND_HDA_POWER_SAVE=y 1.119 +CONFIG_SND_HDA_POWER_SAVE_DEFAULT=5 1.120 CONFIG_SND_HDSP=m 1.121 CONFIG_SND_HDSPM=m 1.122 CONFIG_SND_HIFIER=m 1.123 @@ -2595,9 +2601,9 @@ 1.124 CONFIG_USB_DEVICEFS=y 1.125 CONFIG_USB_DEVICE_CLASS=y 1.126 # CONFIG_USB_DYNAMIC_MINORS is not set 1.127 -# CONFIG_USB_SUSPEND is not set 1.128 +CONFIG_USB_SUSPEND=y 1.129 # CONFIG_USB_OTG is not set 1.130 -# CONFIG_USB_MON is not set 1.131 +CONFIG_USB_MON=m 1.132 CONFIG_USB_WUSB=m 1.133 CONFIG_USB_WUSB_CBAF=m 1.134 # CONFIG_USB_WUSB_CBAF_DEBUG is not set 1.135 @@ -2613,7 +2619,6 @@ 1.136 # CONFIG_USB_ISP116X_HCD is not set 1.137 # CONFIG_USB_ISP1760_HCD is not set 1.138 CONFIG_USB_OHCI_HCD=y 1.139 -# CONFIG_USB_OHCI_HCD_SSB is not set 1.140 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set 1.141 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set 1.142 CONFIG_USB_OHCI_LITTLE_ENDIAN=y 1.143 @@ -2842,7 +2847,7 @@ 1.144 # CONFIG_OTUS is not set 1.145 CONFIG_RT2860=m 1.146 CONFIG_RT2870=m 1.147 -# CONFIG_RT3070 is not set 1.148 +CONFIG_RT3070=m 1.149 # CONFIG_COMEDI is not set 1.150 # CONFIG_ASUS_OLED is not set 1.151 # CONFIG_PANEL is not set 1.152 @@ -3017,8 +3022,8 @@ 1.153 # CONFIG_AUFS_SHWH is not set 1.154 # CONFIG_AUFS_BR_RAMFS is not set 1.155 # CONFIG_AUFS_BR_FUSE is not set 1.156 +CONFIG_AUFS_BDEV_LOOP=y 1.157 # CONFIG_AUFS_DEBUG is not set 1.158 -CONFIG_AUFS_BDEV_LOOP=y 1.159 # CONFIG_NILFS2_FS is not set 1.160 CONFIG_NETWORK_FILESYSTEMS=y 1.161 CONFIG_NFS_FS=y