Commit dbd56307 authored by Linus Torvalds's avatar Linus Torvalds

Update kernel version and defconfig

parent 5c58f77a
VERSION = 2 VERSION = 2
PATCHLEVEL = 5 PATCHLEVEL = 5
SUBLEVEL = 5 SUBLEVEL = 6
EXTRAVERSION = EXTRAVERSION =-pre1
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION) KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
......
...@@ -454,6 +454,7 @@ CONFIG_EEPRO100=y ...@@ -454,6 +454,7 @@ CONFIG_EEPRO100=y
# #
# CONFIG_ACENIC is not set # CONFIG_ACENIC is not set
# CONFIG_DL2K is not set # CONFIG_DL2K is not set
# CONFIG_E1000 is not set
# CONFIG_MYRI_SBUS is not set # CONFIG_MYRI_SBUS is not set
# CONFIG_NS83820 is not set # CONFIG_NS83820 is not set
# CONFIG_HAMACHI is not set # CONFIG_HAMACHI is not set
...@@ -718,11 +719,19 @@ CONFIG_SND_MIXER_OSS=y ...@@ -718,11 +719,19 @@ CONFIG_SND_MIXER_OSS=y
CONFIG_SND_PCM_OSS=y CONFIG_SND_PCM_OSS=y
CONFIG_SND_SEQUENCER_OSS=y CONFIG_SND_SEQUENCER_OSS=y
# CONFIG_SND_DEBUG is not set # CONFIG_SND_DEBUG is not set
#
# Generic devices
#
# CONFIG_SND_DUMMY is not set # CONFIG_SND_DUMMY is not set
# CONFIG_SND_VIRMIDI is not set # CONFIG_SND_VIRMIDI is not set
# CONFIG_SND_MTPAV is not set # CONFIG_SND_MTPAV is not set
# CONFIG_SND_SERIAL_U16550 is not set # CONFIG_SND_SERIAL_U16550 is not set
# CONFIG_SND_MPU401 is not set # CONFIG_SND_MPU401 is not set
#
# ISA devices
#
# CONFIG_SND_AD1816A is not set # CONFIG_SND_AD1816A is not set
# CONFIG_SND_AD1848 is not set # CONFIG_SND_AD1848 is not set
# CONFIG_SND_CS4231 is not set # CONFIG_SND_CS4231 is not set
...@@ -749,6 +758,10 @@ CONFIG_SND_SEQUENCER_OSS=y ...@@ -749,6 +758,10 @@ CONFIG_SND_SEQUENCER_OSS=y
# CONFIG_SND_DT0197H is not set # CONFIG_SND_DT0197H is not set
# CONFIG_SND_OPL3SA2 is not set # CONFIG_SND_OPL3SA2 is not set
# CONFIG_SND_SGALAXY is not set # CONFIG_SND_SGALAXY is not set
#
# PCI devices
#
# CONFIG_SND_ALI5451 is not set # CONFIG_SND_ALI5451 is not set
# CONFIG_SND_CS46XX is not set # CONFIG_SND_CS46XX is not set
# CONFIG_SND_EMU10K1 is not set # CONFIG_SND_EMU10K1 is not set
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment