* [mips] Update configurations.
svn path=/dists/trunk/linux-2.6/; revision=6766
This commit is contained in:
parent
01edb0e569
commit
11db77c656
|
@ -1 +1,3 @@
|
|||
CONFIG_MIPS=y
|
||||
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
||||
CONFIG_GENERIC_FIND_NEXT_BIT=y
|
||||
|
|
|
@ -782,7 +782,6 @@ CONFIG_MOUSE_PS2=y
|
|||
# Hardware I/O ports
|
||||
#
|
||||
CONFIG_SERIO=y
|
||||
# CONFIG_SERIO_I8042 is not set
|
||||
CONFIG_SERIO_SERPORT=y
|
||||
# CONFIG_SERIO_PARKBD is not set
|
||||
CONFIG_SERIO_LIBPS2=y
|
||||
|
@ -1395,3 +1394,8 @@ CONFIG_TEXTSEARCH=y
|
|||
CONFIG_TEXTSEARCH_KMP=m
|
||||
CONFIG_TEXTSEARCH_BM=m
|
||||
CONFIG_TEXTSEARCH_FSM=m
|
||||
CONFIG_VIDEO_BUF=m
|
||||
CONFIG_VIDEO_V4L2=y
|
||||
CONFIG_VIDEO_V4L1_COMPAT=y
|
||||
CONFIG_SERIO_I8042=y
|
||||
# CONFIG_USB_ARCH_HAS_EHCI is not set
|
||||
|
|
|
@ -1180,7 +1180,6 @@ CONFIG_SND_SUPPORT_OLD_API=y
|
|||
# CONFIG_SND_ICE1724 is not set
|
||||
# CONFIG_SND_INTEL8X0 is not set
|
||||
# CONFIG_SND_INTEL8X0M is not set
|
||||
# CONFIG_SND_KORG1212 is not set
|
||||
# CONFIG_SND_MAESTRO3 is not set
|
||||
# CONFIG_SND_MIXART is not set
|
||||
# CONFIG_SND_NM256 is not set
|
||||
|
@ -1515,3 +1514,24 @@ CONFIG_TEXTSEARCH=y
|
|||
CONFIG_TEXTSEARCH_KMP=m
|
||||
CONFIG_TEXTSEARCH_BM=m
|
||||
CONFIG_TEXTSEARCH_FSM=m
|
||||
CONFIG_SND_OPL3_LIB=m
|
||||
# CONFIG_SOUND_ES1371 is not set
|
||||
CONFIG_SND_CS46XX_NEW_DSP=y
|
||||
CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin"
|
||||
CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
|
||||
CONFIG_SOUND_EMU10K1=m
|
||||
# CONFIG_SOUND_VIA82CXXX is not set
|
||||
CONFIG_SND_MPU401_UART=m
|
||||
CONFIG_SND_FM801_TEA575X=m
|
||||
CONFIG_SERIAL_8250_PCI=y
|
||||
CONFIG_SOUND_BT878=m
|
||||
CONFIG_VIDEO_BUF=m
|
||||
CONFIG_SND_AC97_CODEC=m
|
||||
CONFIG_SND_BT87X_OVERCLOCK=y
|
||||
CONFIG_MSNDCLAS_INIT_FILE="/etc/sound/msndinit.bin"
|
||||
CONFIG_SND_HWDEP=m
|
||||
CONFIG_MSNDCLAS_PERM_FILE="/etc/sound/msndperm.bin"
|
||||
CONFIG_VIDEO_V4L2=y
|
||||
CONFIG_SND_VX_LIB=m
|
||||
CONFIG_VIDEO_V4L1_COMPAT=y
|
||||
CONFIG_SND_KORG1212=m
|
||||
|
|
|
@ -1378,7 +1378,6 @@ CONFIG_SOUND_PRIME=y
|
|||
# CONFIG_SOUND_TRIDENT is not set
|
||||
# CONFIG_SOUND_MSNDCLAS is not set
|
||||
# CONFIG_SOUND_MSNDPIN is not set
|
||||
# CONFIG_SOUND_TVMIXER is not set
|
||||
|
||||
#
|
||||
# USB support
|
||||
|
@ -1413,7 +1412,6 @@ CONFIG_USB_SL811_HCD=m
|
|||
# USB Device Class drivers
|
||||
#
|
||||
# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
|
||||
# CONFIG_USB_ACM is not set
|
||||
# CONFIG_USB_PRINTER is not set
|
||||
|
||||
#
|
||||
|
@ -1434,7 +1432,6 @@ CONFIG_USB_STORAGE=m
|
|||
# CONFIG_USB_STORAGE_SDDR55 is not set
|
||||
# CONFIG_USB_STORAGE_JUMPSHOT is not set
|
||||
CONFIG_USB_STORAGE_ALAUDA=y
|
||||
# CONFIG_USB_STORAGE_ONETOUCH is not set
|
||||
# CONFIG_USB_LIBUSUAL is not set
|
||||
|
||||
#
|
||||
|
@ -1853,3 +1850,43 @@ CONFIG_TEXTSEARCH=y
|
|||
CONFIG_TEXTSEARCH_KMP=m
|
||||
CONFIG_TEXTSEARCH_BM=m
|
||||
CONFIG_TEXTSEARCH_FSM=m
|
||||
# CONFIG_SOUND_ES1371 is not set
|
||||
CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin"
|
||||
CONFIG_USB_NET2280=m
|
||||
CONFIG_USB_ALI_M5632=y
|
||||
CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
|
||||
CONFIG_USB_FILE_STORAGE=m
|
||||
CONFIG_SND_SEQUENCER_OSS=y
|
||||
CONFIG_SOUND_EMU10K1=m
|
||||
# CONFIG_SOUND_VIA82CXXX is not set
|
||||
CONFIG_USB_EPSON2888=y
|
||||
CONFIG_SND_VIRMIDI=m
|
||||
CONFIG_USB_AN2720=y
|
||||
# CONFIG_USB_GADGET_PXA2XX is not set
|
||||
CONFIG_USB_GADGET_DUALSPEED=y
|
||||
# CONFIG_USB_GADGET_OMAP is not set
|
||||
CONFIG_USB_GADGET_NET2280=y
|
||||
CONFIG_USB_ETH_RNDIS=y
|
||||
CONFIG_PARPORT_NOT_PC=y
|
||||
# CONFIG_USB_GADGET_DEBUG_FILES is not set
|
||||
CONFIG_SOUND_BT878=m
|
||||
CONFIG_VIDEO_BUF=m
|
||||
CONFIG_USB_FILE_STORAGE_TEST=y
|
||||
CONFIG_MSNDCLAS_INIT_FILE="/etc/sound/msndinit.bin"
|
||||
CONFIG_MSNDCLAS_PERM_FILE="/etc/sound/msndperm.bin"
|
||||
# CONFIG_USB_GADGET_DUMMY_HCD is not set
|
||||
CONFIG_USB_GADGETFS=m
|
||||
CONFIG_USB_ETH=m
|
||||
CONFIG_VIDEO_V4L2=y
|
||||
CONFIG_USB_ARMLINUX=y
|
||||
# CONFIG_USB_W9968CF is not set
|
||||
# CONFIG_USB_GADGET_GOKU is not set
|
||||
# CONFIG_USB_GADGET_LH7A40X is not set
|
||||
CONFIG_USB_G_SERIAL=m
|
||||
CONFIG_USB_BELKIN=y
|
||||
CONFIG_USB_ZERO=m
|
||||
CONFIG_VIDEO_V4L1_COMPAT=y
|
||||
CONFIG_SND_SEQ_DUMMY=m
|
||||
CONFIG_SOUND_TVMIXER=m
|
||||
CONFIG_USB_STORAGE_ONETOUCH=y
|
||||
CONFIG_USB_ACM=m
|
||||
|
|
|
@ -1303,7 +1303,6 @@ CONFIG_SND_AC97_CODEC=m
|
|||
CONFIG_SND_AC97_BUS=m
|
||||
# CONFIG_SND_DUMMY is not set
|
||||
# CONFIG_SND_MTPAV is not set
|
||||
# CONFIG_SND_SERIAL_U16550 is not set
|
||||
# CONFIG_SND_MPU401 is not set
|
||||
|
||||
#
|
||||
|
@ -1373,7 +1372,6 @@ CONFIG_SOUND_PRIME=y
|
|||
# CONFIG_SOUND_TRIDENT is not set
|
||||
# CONFIG_SOUND_MSNDCLAS is not set
|
||||
# CONFIG_SOUND_MSNDPIN is not set
|
||||
# CONFIG_SOUND_TVMIXER is not set
|
||||
|
||||
#
|
||||
# USB support
|
||||
|
@ -1848,3 +1846,20 @@ CONFIG_TEXTSEARCH=y
|
|||
CONFIG_TEXTSEARCH_KMP=m
|
||||
CONFIG_TEXTSEARCH_BM=m
|
||||
CONFIG_TEXTSEARCH_FSM=m
|
||||
# CONFIG_SOUND_ES1371 is not set
|
||||
CONFIG_SND_SEQUENCER_OSS=y
|
||||
# CONFIG_SOUND_EMU10K1 is not set
|
||||
# CONFIG_SOUND_VIA82CXXX is not set
|
||||
CONFIG_SND_VIRMIDI=m
|
||||
# CONFIG_SOUND_BT878 is not set
|
||||
CONFIG_VIDEO_BUF=m
|
||||
CONFIG_VIDEO_V4L2=y
|
||||
# CONFIG_USB_W9968CF is not set
|
||||
CONFIG_VIDEO_V4L1_COMPAT=y
|
||||
CONFIG_SND_SEQ_DUMMY=m
|
||||
CONFIG_SND_SERIAL_U16550=m
|
||||
CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin"
|
||||
CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
|
||||
CONFIG_MSNDCLAS_INIT_FILE="/etc/sound/msndinit.bin"
|
||||
CONFIG_MSNDCLAS_PERM_FILE="/etc/sound/msndperm.bin"
|
||||
CONFIG_SOUND_TVMIXER=m
|
||||
|
|
|
@ -8,6 +8,7 @@ linux-2.6 (2.6.16+2.6.17-rc5-0experimental.1) UNRELEASED; urgency=low
|
|||
|
||||
[ Thiemo Seufer ]
|
||||
* [mips] Fix SWARM FPU detection.
|
||||
* [mips] Update configurations.
|
||||
|
||||
[ Kyle McMartin ]
|
||||
* [hppa] Disable CONFIG_DETECT_SOFTLOCKUP to fix pa8800 boot.
|
||||
|
|
Loading…
Reference in New Issue