Commit 292d4ed3 authored by Anton Altaparmakov's avatar Anton Altaparmakov
Browse files

Merge branch 'master' of /usr/src/ntfs-2.6/

parents 3c6af7fa e4f5c82a

Documentation/usb/error-codes.txt

+3 −2
Original line number Diff line number Diff line
@@ -46,8 +46,9 @@ USB-specific: 


-EMSGSIZE	(a) endpoint maxpacket size is zero; it is not usable

		    in the current interface altsetting.

		(b) ISO packet is biger than endpoint maxpacket

		(c) requested data transfer size is invalid (negative)

		(b) ISO packet is larger than the endpoint maxpacket.

		(c) requested data transfer length is invalid: negative

		    or too large for the host controller.



-ENOSPC		This request would overcommit the usb bandwidth reserved

		for periodic transfers (interrupt, isochronous).

MAINTAINERS

+12 −0
Original line number Diff line number Diff line
@@ -536,6 +536,7 @@ P: Mauro Carvalho Chehab 
M:	mchehab@brturbo.com.br

L:	video4linux-list@redhat.com

W:	http://linuxtv.org

T:	quilt http://www.linuxtv.org/download/quilt/

S:	Maintained



BUSLOGIC SCSI DRIVER
@@ -833,6 +834,7 @@ P: LinuxTV.org Project 
M: 	linux-dvb-maintainer@linuxtv.org

L: 	linux-dvb@linuxtv.org (subscription required)

W:	http://linuxtv.org/

T:	quilt http://www.linuxtv.org/download/quilt/

S:	Supported



EATA-DMA SCSI DRIVER
@@ -1634,6 +1636,15 @@ L: ldm-devel@lists.sourceforge.net 
W:	http://ldm.sourceforge.net

S:	Maintained



LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)

P:	Eric Moore

M:	Eric.Moore@lsil.com

M:	support@lsil.com

L:	mpt_linux_developer@lsil.com

L:	linux-scsi@vger.kernel.org

W:	http://www.lsilogic.com/support

S:	Supported



LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers

P:	Matthew Wilcox

M:	matthew@wil.cx
@@ -2885,6 +2896,7 @@ P: Mauro Carvalho Chehab 
M:	mchehab@brturbo.com.br

L:	video4linux-list@redhat.com

W:	http://linuxtv.org

T:	quilt http://www.linuxtv.org/download/quilt/

S:	Maintained



W1 DALLAS'S 1-WIRE BUS

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 15

EXTRAVERSION =-rc2

EXTRAVERSION =-rc5

NAME=Affluent Albatross



# *DOCUMENTATION*

arch/arm/configs/corgi_defconfig

+64 −19
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.14-rc3

# Sun Oct  9 15:46:42 2005

# Linux kernel version: 2.6.15-rc2

# Mon Nov 28 10:30:09 2005

#

CONFIG_ARM=y

CONFIG_MMU=y
@@ -63,6 +63,23 @@ CONFIG_OBSOLETE_MODPARM=y 
# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_KMOD=y



#

# Block layer

#



#

# IO Schedulers

#

CONFIG_IOSCHED_NOOP=y

CONFIG_IOSCHED_AS=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

CONFIG_DEFAULT_AS=y

# CONFIG_DEFAULT_DEADLINE is not set

# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="anticipatory"



#

# System Type

#
@@ -85,6 +102,7 @@ CONFIG_ARCH_PXA=y 
# CONFIG_ARCH_LH7A40X is not set

# CONFIG_ARCH_OMAP is not set

# CONFIG_ARCH_VERSATILE is not set

# CONFIG_ARCH_REALVIEW is not set

# CONFIG_ARCH_IMX is not set

# CONFIG_ARCH_H720X is not set

# CONFIG_ARCH_AAEC2000 is not set
@@ -98,12 +116,14 @@ CONFIG_ARCH_PXA=y 
CONFIG_PXA_SHARPSL=y

CONFIG_PXA_SHARPSL_25x=y

# CONFIG_PXA_SHARPSL_27x is not set

# CONFIG_MACH_POODLE is not set

CONFIG_MACH_POODLE=y

CONFIG_MACH_CORGI=y

CONFIG_MACH_SHEPHERD=y

CONFIG_MACH_HUSKY=y

CONFIG_MACH_TOSA=y

CONFIG_PXA25x=y

CONFIG_PXA_SHARP_C7xx=y

CONFIG_PXA_SSP=y



#

# Processor Type
@@ -155,6 +175,7 @@ CONFIG_FLATMEM_MANUAL=y 
CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPLIT_PTLOCK_CPUS=4096

CONFIG_ALIGNMENT_TRAP=y



#
@@ -235,6 +256,10 @@ CONFIG_INET6_TUNNEL=m 
CONFIG_IPV6_TUNNEL=m

CONFIG_NETFILTER=y

# CONFIG_NETFILTER_DEBUG is not set



#

# Core Netfilter Configuration

#

# CONFIG_NETFILTER_NETLINK is not set



#
@@ -356,6 +381,10 @@ CONFIG_IP6_NF_RAW=m 
# CONFIG_NET_DIVERT is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set



#

# QoS and/or fair queueing

#

# CONFIG_NET_SCHED is not set

CONFIG_NET_CLS_ROUTE=y
@@ -413,6 +442,7 @@ CONFIG_IRCOMM=m 
# CONFIG_SMC_IRCC_FIR is not set

# CONFIG_ALI_FIR is not set

# CONFIG_VIA_FIR is not set

CONFIG_PXA_FICP=m

CONFIG_BT=m

CONFIG_BT_L2CAP=m

CONFIG_BT_SCO=m
@@ -431,7 +461,6 @@ CONFIG_BT_HCIUSB=m 
CONFIG_BT_HCIUART=m

CONFIG_BT_HCIUART_H4=y

CONFIG_BT_HCIUART_BCSP=y

CONFIG_BT_HCIUART_BCSP_TXCRC=y

CONFIG_BT_HCIBCM203X=m

CONFIG_BT_HCIBPA10X=m

CONFIG_BT_HCIBFUSB=m
@@ -458,6 +487,11 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y 
CONFIG_FW_LOADER=y

# CONFIG_DEBUG_DRIVER is not set



#

# Connector - unified userspace <-> kernelspace linker

#

# CONFIG_CONNECTOR is not set



#

# Memory Technology Devices (MTD)

#
@@ -477,6 +511,7 @@ CONFIG_MTD_BLOCK=y 
# CONFIG_FTL is not set

# CONFIG_NFTL is not set

# CONFIG_INFTL is not set

# CONFIG_RFD_FTL is not set



#

# RAM/ROM/Flash chip drivers
@@ -531,6 +566,11 @@ CONFIG_MTD_NAND_IDS=y 
CONFIG_MTD_NAND_SHARPSL=y

# CONFIG_MTD_NAND_NANDSIM is not set



#

# OneNAND Flash Device Drivers

#

# CONFIG_MTD_ONENAND is not set



#

# Parallel port support

#
@@ -551,14 +591,6 @@ CONFIG_BLK_DEV_LOOP=y 
# CONFIG_BLK_DEV_RAM is not set

CONFIG_BLK_DEV_RAM_COUNT=16

# CONFIG_CDROM_PKTCDVD is not set



#

# IO Schedulers

#

CONFIG_IOSCHED_NOOP=y

CONFIG_IOSCHED_AS=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

# CONFIG_ATA_OVER_ETH is not set



#
@@ -625,6 +657,7 @@ CONFIG_SCSI_MULTI_LUN=y 
#

# SCSI low-level drivers

#

# CONFIG_ISCSI_TCP is not set

# CONFIG_SCSI_SATA is not set

# CONFIG_SCSI_DEBUG is not set
@@ -748,6 +781,7 @@ CONFIG_PPP_ASYNC=m 
# CONFIG_PPP_SYNC_TTY is not set

# CONFIG_PPP_DEFLATE is not set

CONFIG_PPP_BSDCOMP=m

# CONFIG_PPP_MPPE is not set

# CONFIG_PPPOE is not set

# CONFIG_SLIP is not set

# CONFIG_SHAPER is not set
@@ -850,11 +884,15 @@ CONFIG_UNIX98_PTYS=y 
# PCMCIA character devices

#

# CONFIG_SYNCLINK_CS is not set

# CONFIG_CARDMAN_4000 is not set

# CONFIG_CARDMAN_4040 is not set

# CONFIG_RAW_DRIVER is not set



#

# TPM devices

#

# CONFIG_TCG_TPM is not set

# CONFIG_TELCLOCK is not set



#

# I2C support
@@ -889,6 +927,7 @@ CONFIG_I2C_PXA=y 
# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_RTC8564 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_RTC_X1205_I2C is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set
@@ -957,7 +996,10 @@ CONFIG_VIDEO_DEV=m 
# CONFIG_VIDEO_SAA5246A is not set

# CONFIG_VIDEO_SAA5249 is not set

# CONFIG_TUNER_3036 is not set

# CONFIG_VIDEO_EM28XX is not set

# CONFIG_VIDEO_OVCAMCHIP is not set

# CONFIG_VIDEO_AUDIO_DECODER is not set

# CONFIG_VIDEO_DECODER is not set



#

# Radio Adapters
@@ -976,13 +1018,12 @@ CONFIG_FB=y 
CONFIG_FB_CFB_FILLRECT=y

CONFIG_FB_CFB_COPYAREA=y

CONFIG_FB_CFB_IMAGEBLIT=y

CONFIG_FB_SOFT_CURSOR=y

# CONFIG_FB_MACMODES is not set

# CONFIG_FB_MODE_HELPERS is not set

# CONFIG_FB_TILEBLITTING is not set

# CONFIG_FB_S1D13XXX is not set

# CONFIG_FB_PXA is not set

CONFIG_FB_W100=y

# CONFIG_FB_S1D13XXX is not set

# CONFIG_FB_VIRTUAL is not set



#
@@ -991,6 +1032,7 @@ CONFIG_FB_W100=y 
# CONFIG_VGA_CONSOLE is not set

CONFIG_DUMMY_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE=y

# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set

CONFIG_FONTS=y

CONFIG_FONT_8x8=y

CONFIG_FONT_8x16=y
@@ -1087,15 +1129,15 @@ CONFIG_USB_SL811_CS=m 
# USB Device Class drivers

#

# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set

CONFIG_USB_ACM=m

CONFIG_USB_PRINTER=m



#

# USB Bluetooth TTY can only be used with disabled Bluetooth subsystem

# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'

#

CONFIG_USB_ACM=m

CONFIG_USB_PRINTER=m



#

# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information

# may also be needed; see USB_STORAGE Help for more information

#

CONFIG_USB_STORAGE=m

# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1107,7 +1149,6 @@ CONFIG_USB_STORAGE=m 
# CONFIG_USB_STORAGE_SDDR09 is not set

# CONFIG_USB_STORAGE_SDDR55 is not set

# CONFIG_USB_STORAGE_JUMPSHOT is not set

# CONFIG_USB_STORAGE_ONETOUCH is not set



#

# USB Input Devices
@@ -1185,6 +1226,7 @@ CONFIG_USB_MON=y 
CONFIG_USB_SERIAL=m

CONFIG_USB_SERIAL_GENERIC=y

# CONFIG_USB_SERIAL_AIRPRIME is not set

# CONFIG_USB_SERIAL_ANYDATA is not set

CONFIG_USB_SERIAL_BELKIN=m

# CONFIG_USB_SERIAL_WHITEHEAT is not set

CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
@@ -1340,6 +1382,7 @@ CONFIG_RAMFS=y 
CONFIG_JFFS2_FS=y

CONFIG_JFFS2_FS_DEBUG=0

CONFIG_JFFS2_FS_WRITEBUFFER=y

CONFIG_JFFS2_SUMMARY=y

CONFIG_JFFS2_COMPRESSION_OPTIONS=y

CONFIG_JFFS2_ZLIB=y

CONFIG_JFFS2_RTIME=y
@@ -1466,7 +1509,9 @@ CONFIG_DETECT_SOFTLOCKUP=y 
CONFIG_DEBUG_BUGVERBOSE=y

# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_FS is not set

# CONFIG_DEBUG_VM is not set

CONFIG_FRAME_POINTER=y

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_DEBUG_USER is not set

# CONFIG_DEBUG_WAITQ is not set

CONFIG_DEBUG_ERRORS=y

arch/arm/configs/poodle_defconfig

deleted100644 → 0
+0 −1015

File deleted.

Preview size limit exceeded, changes collapsed.