Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25f73891 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master' into upstream-fixes

parents fef6108d 4d5c34ec

MAINTAINERS

+4 −0
Original line number Original line Diff line number Diff line
@@ -2065,8 +2065,12 @@ P: Matthew Wilcox 
M:	matthew@wil.cx

M:	matthew@wil.cx

P:	Grant Grundler

P:	Grant Grundler

M:	grundler@parisc-linux.org

M:	grundler@parisc-linux.org

P:	Kyle McMartin

M:	kyle@parisc-linux.org

L:	parisc-linux@parisc-linux.org

L:	parisc-linux@parisc-linux.org

W:	http://www.parisc-linux.org/

W:	http://www.parisc-linux.org/

T:	git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git

T:	cvs cvs.parisc-linux.org:/var/cvs/linux-2.6

S:	Maintained

S:	Maintained





PCI ERROR RECOVERY

PCI ERROR RECOVERY

arch/alpha/lib/strncpy.S

+4 −4
Original line number Original line Diff line number Diff line
@@ -43,8 +43,8 @@ strncpy: 




	.align	4

	.align	4

$multiword:

$multiword:

	subq	$24, 1, $2	# clear the final bits in the prev word

	subq	$27, 1, $2	# clear the final bits in the prev word

	or	$2, $24, $2

	or	$2, $27, $2

	zapnot	$1, $2, $1

	zapnot	$1, $2, $1

	subq	$18, 1, $18

	subq	$18, 1, $18
@@ -70,8 +70,8 @@ $multiword: 
	bne	$18, 0b

	bne	$18, 0b





1:	ldq_u	$1, 0($16)	# clear the leading bits in the final word

1:	ldq_u	$1, 0($16)	# clear the leading bits in the final word

	subq	$27, 1, $2

	subq	$24, 1, $2

	or	$2, $27, $2

	or	$2, $24, $2





	zap	$1, $2, $1

	zap	$1, $2, $1

	stq_u	$1, 0($16)

	stq_u	$1, 0($16)

arch/arm/configs/ep93xx_defconfig

+54 −25
Original line number Original line Diff line number Diff line 
#

#

# Automatically generated make config: don't edit

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.16

# Linux kernel version: 2.6.17-rc2

# Mon Mar 20 14:54:51 2006

# Wed Apr 19 21:21:01 2006

#

#

CONFIG_ARM=y

CONFIG_ARM=y

CONFIG_MMU=y

CONFIG_MMU=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_VECTORS_BASE=0xffff0000





#

#

# Code maturity level options

# Code maturity level options
@@ -28,6 +30,7 @@ CONFIG_SYSCTL=y 
# CONFIG_AUDIT is not set

# CONFIG_AUDIT is not set

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_IKCONFIG_PROC=y

# CONFIG_RELAY is not set

CONFIG_INITRAMFS_SOURCE=""

CONFIG_INITRAMFS_SOURCE=""

CONFIG_UID16=y

CONFIG_UID16=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -43,10 +46,6 @@ CONFIG_BASE_FULL=y 
CONFIG_FUTEX=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y

CONFIG_EPOLL=y

CONFIG_SHMEM=y

CONFIG_SHMEM=y

CONFIG_CC_ALIGN_FUNCTIONS=0

CONFIG_CC_ALIGN_LABELS=0

CONFIG_CC_ALIGN_LOOPS=0

CONFIG_CC_ALIGN_JUMPS=0

CONFIG_SLAB=y

CONFIG_SLAB=y

# CONFIG_TINY_SHMEM is not set

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

CONFIG_BASE_SMALL=0
@@ -59,7 +58,6 @@ CONFIG_OBSOLETE_INTERMODULE=y 
CONFIG_MODULES=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

CONFIG_OBSOLETE_MODPARM=y

# CONFIG_MODVERSIONS is not set

# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_KMOD=y

CONFIG_KMOD=y
@@ -67,6 +65,7 @@ CONFIG_KMOD=y 
#

#

# Block layer

# Block layer

#

#

# CONFIG_BLK_DEV_IO_TRACE is not set





#

#

# IO Schedulers

# IO Schedulers
@@ -94,6 +93,7 @@ CONFIG_ARCH_EP93XX=y 
# CONFIG_ARCH_IOP3XX is not set

# CONFIG_ARCH_IOP3XX is not set

# CONFIG_ARCH_IXP4XX is not set

# CONFIG_ARCH_IXP4XX is not set

# CONFIG_ARCH_IXP2000 is not set

# CONFIG_ARCH_IXP2000 is not set

# CONFIG_ARCH_IXP23XX is not set

# CONFIG_ARCH_L7200 is not set

# CONFIG_ARCH_L7200 is not set

# CONFIG_ARCH_PXA is not set

# CONFIG_ARCH_PXA is not set

# CONFIG_ARCH_RPC is not set

# CONFIG_ARCH_RPC is not set
@@ -112,7 +112,6 @@ CONFIG_ARCH_EP93XX=y 
#

#

# Cirrus EP93xx Implementation Options

# Cirrus EP93xx Implementation Options

#

#

CONFIG_CRUNCH=y





#

#

# EP93xx Platforms

# EP93xx Platforms
@@ -232,12 +231,15 @@ CONFIG_SYN_COOKIES=y 
# CONFIG_INET_AH is not set

# CONFIG_INET_AH is not set

# CONFIG_INET_ESP is not set

# CONFIG_INET_ESP is not set

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_XFRM_TUNNEL is not set

# CONFIG_INET_TUNNEL is not set

# CONFIG_INET_TUNNEL is not set

CONFIG_INET_DIAG=y

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_BIC=y

CONFIG_TCP_CONG_BIC=y

# CONFIG_IPV6 is not set

# CONFIG_IPV6 is not set

# CONFIG_INET6_XFRM_TUNNEL is not set

# CONFIG_INET6_TUNNEL is not set

# CONFIG_NETFILTER is not set

# CONFIG_NETFILTER is not set





#

#
@@ -346,7 +348,6 @@ CONFIG_MTD_CFI_I2=y 
# CONFIG_MTD_OTP is not set

# CONFIG_MTD_OTP is not set

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_INTELEXT=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_CFI_AMDSTD=y

CONFIG_MTD_CFI_AMDSTD_RETRY=0

CONFIG_MTD_CFI_STAA=y

CONFIG_MTD_CFI_STAA=y

CONFIG_MTD_CFI_UTIL=y

CONFIG_MTD_CFI_UTIL=y

# CONFIG_MTD_RAM is not set

# CONFIG_MTD_RAM is not set
@@ -371,7 +372,6 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1 
# CONFIG_MTD_SLRAM is not set

# CONFIG_MTD_SLRAM is not set

# CONFIG_MTD_PHRAM is not set

# CONFIG_MTD_PHRAM is not set

# CONFIG_MTD_MTDRAM is not set

# CONFIG_MTD_MTDRAM is not set

# CONFIG_MTD_BLKMTD is not set

# CONFIG_MTD_BLOCK2MTD is not set

# CONFIG_MTD_BLOCK2MTD is not set





#

#
@@ -412,7 +412,7 @@ CONFIG_MTD_NAND_IDS=y 
# CONFIG_BLK_DEV_NBD is not set

# CONFIG_BLK_DEV_NBD is not set

# CONFIG_BLK_DEV_UB is not set

# CONFIG_BLK_DEV_UB is not set

# CONFIG_BLK_DEV_RAM is not set

# CONFIG_BLK_DEV_RAM is not set

CONFIG_BLK_DEV_RAM_COUNT=16

# CONFIG_BLK_DEV_INITRD is not set

# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set

# CONFIG_ATA_OVER_ETH is not set
@@ -576,13 +576,13 @@ CONFIG_WATCHDOG=y 
# Watchdog Device Drivers

# Watchdog Device Drivers

#

#

# CONFIG_SOFT_WATCHDOG is not set

# CONFIG_SOFT_WATCHDOG is not set

CONFIG_EP93XX_WATCHDOG=y





#

#

# USB-based Watchdog Cards

# USB-based Watchdog Cards

#

#

# CONFIG_USBPCWATCHDOG is not set

# CONFIG_USBPCWATCHDOG is not set

# CONFIG_NVRAM is not set

# CONFIG_NVRAM is not set

# CONFIG_RTC is not set

# CONFIG_DTLK is not set

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

# CONFIG_R3964 is not set
@@ -626,9 +626,7 @@ CONFIG_I2C_ALGOBIT=y 
# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_RTC8564 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_RTC_X1205_I2C is not set

CONFIG_I2C_DEBUG_CORE=y

CONFIG_I2C_DEBUG_CORE=y

CONFIG_I2C_DEBUG_ALGO=y

CONFIG_I2C_DEBUG_ALGO=y

CONFIG_I2C_DEBUG_BUS=y

CONFIG_I2C_DEBUG_BUS=y
@@ -690,7 +688,16 @@ CONFIG_HWMON=y 
#

#





#

#

# Multimedia Capabilities Port drivers

# LED devices

#

# CONFIG_NEW_LEDS is not set



#

# LED drivers

#



#

# LED Triggers

#

#





#

#
@@ -702,6 +709,7 @@ CONFIG_HWMON=y 
# Digital Video Broadcasting Devices

# Digital Video Broadcasting Devices

#

#

# CONFIG_DVB is not set

# CONFIG_DVB is not set

# CONFIG_USB_DABUSB is not set





#

#

# Graphics support

# Graphics support
@@ -718,6 +726,7 @@ CONFIG_HWMON=y 
#

#

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_HCD=y

# CONFIG_USB_ARCH_HAS_OHCI is not set

# CONFIG_USB_ARCH_HAS_OHCI is not set

# CONFIG_USB_ARCH_HAS_EHCI is not set

CONFIG_USB=y

CONFIG_USB=y

CONFIG_USB_DEBUG=y

CONFIG_USB_DEBUG=y
@@ -775,15 +784,6 @@ CONFIG_USB_STORAGE=y 
# CONFIG_USB_MDC800 is not set

# CONFIG_USB_MDC800 is not set

# CONFIG_USB_MICROTEK is not set

# CONFIG_USB_MICROTEK is not set





#

# USB Multimedia devices

#

# CONFIG_USB_DABUSB is not set



#

# Video4Linux support is needed for USB Multimedia device support

#



#

#

# USB Network Adapters

# USB Network Adapters

#

#
@@ -813,6 +813,7 @@ CONFIG_USB_SERIAL_CONSOLE=y 
# CONFIG_USB_SERIAL_CYPRESS_M8 is not set

# CONFIG_USB_SERIAL_CYPRESS_M8 is not set

# CONFIG_USB_SERIAL_EMPEG is not set

# CONFIG_USB_SERIAL_EMPEG is not set

# CONFIG_USB_SERIAL_FTDI_SIO is not set

# CONFIG_USB_SERIAL_FTDI_SIO is not set

# CONFIG_USB_SERIAL_FUNSOFT is not set

# CONFIG_USB_SERIAL_VISOR is not set

# CONFIG_USB_SERIAL_VISOR is not set

# CONFIG_USB_SERIAL_IPAQ is not set

# CONFIG_USB_SERIAL_IPAQ is not set

# CONFIG_USB_SERIAL_IR is not set

# CONFIG_USB_SERIAL_IR is not set
@@ -825,6 +826,7 @@ CONFIG_USB_SERIAL_CONSOLE=y 
# CONFIG_USB_SERIAL_KLSI is not set

# CONFIG_USB_SERIAL_KLSI is not set

# CONFIG_USB_SERIAL_KOBIL_SCT is not set

# CONFIG_USB_SERIAL_KOBIL_SCT is not set

# CONFIG_USB_SERIAL_MCT_U232 is not set

# CONFIG_USB_SERIAL_MCT_U232 is not set

# CONFIG_USB_SERIAL_NAVMAN is not set

CONFIG_USB_SERIAL_PL2303=y

CONFIG_USB_SERIAL_PL2303=y

# CONFIG_USB_SERIAL_HP4X is not set

# CONFIG_USB_SERIAL_HP4X is not set

# CONFIG_USB_SERIAL_SAFE is not set

# CONFIG_USB_SERIAL_SAFE is not set
@@ -864,6 +866,32 @@ CONFIG_USB_SERIAL_PL2303=y 
#

#

# CONFIG_MMC is not set

# CONFIG_MMC is not set





#

# Real Time Clock

#

CONFIG_RTC_LIB=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_HCTOSYS=y

CONFIG_RTC_HCTOSYS_DEVICE="rtc0"



#

# RTC interfaces

#

CONFIG_RTC_INTF_SYSFS=y

CONFIG_RTC_INTF_PROC=y

CONFIG_RTC_INTF_DEV=y



#

# RTC drivers

#

# CONFIG_RTC_DRV_X1205 is not set

# CONFIG_RTC_DRV_DS1672 is not set

# CONFIG_RTC_DRV_PCF8563 is not set

# CONFIG_RTC_DRV_RS5C372 is not set

CONFIG_RTC_DRV_M48T86=y

CONFIG_RTC_DRV_EP93XX=y

# CONFIG_RTC_DRV_TEST is not set



#

#

# File systems

# File systems

#

#
@@ -912,7 +940,6 @@ CONFIG_SYSFS=y 
CONFIG_TMPFS=y

CONFIG_TMPFS=y

# CONFIG_HUGETLB_PAGE is not set

# CONFIG_HUGETLB_PAGE is not set

CONFIG_RAMFS=y

CONFIG_RAMFS=y

# CONFIG_RELAYFS_FS is not set

# CONFIG_CONFIGFS_FS is not set

# CONFIG_CONFIGFS_FS is not set





#

#
@@ -1044,6 +1071,7 @@ CONFIG_LOG_BUF_SHIFT=14 
CONFIG_DETECT_SOFTLOCKUP=y

CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_SCHEDSTATS is not set

CONFIG_DEBUG_SLAB=y

CONFIG_DEBUG_SLAB=y

# CONFIG_DEBUG_SLAB_LEAK is not set

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_SPINLOCK=y

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
@@ -1053,6 +1081,7 @@ CONFIG_DEBUG_BUGVERBOSE=y 
# CONFIG_DEBUG_FS is not set

# CONFIG_DEBUG_FS is not set

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_VM is not set

CONFIG_FRAME_POINTER=y

CONFIG_FRAME_POINTER=y

# CONFIG_UNWIND_INFO is not set

CONFIG_FORCED_INLINING=y

CONFIG_FORCED_INLINING=y

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_RCU_TORTURE_TEST is not set

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_USER=y

arch/arm/configs/ixp2000_defconfig

+41 −18
Original line number Original line Diff line number Diff line 
#

#

# Automatically generated make config: don't edit

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.16-rc2

# Linux kernel version: 2.6.17-rc2

# Wed Feb  8 04:49:11 2006

# Wed Apr 19 21:12:49 2006

#

#

CONFIG_ARM=y

CONFIG_ARM=y

CONFIG_MMU=y

CONFIG_MMU=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_VECTORS_BASE=0xffff0000





#

#

# Code maturity level options

# Code maturity level options

#

#

CONFIG_EXPERIMENTAL=y

CONFIG_EXPERIMENTAL=y

CONFIG_CLEAN_COMPILE=y

CONFIG_BROKEN_ON_SMP=y

CONFIG_BROKEN_ON_SMP=y

CONFIG_INIT_ENV_ARG_LIMIT=32

CONFIG_INIT_ENV_ARG_LIMIT=32
@@ -29,6 +30,7 @@ CONFIG_BSD_PROCESS_ACCT=y 
CONFIG_SYSCTL=y

CONFIG_SYSCTL=y

# CONFIG_AUDIT is not set

# CONFIG_AUDIT is not set

# CONFIG_IKCONFIG is not set

# CONFIG_IKCONFIG is not set

# CONFIG_RELAY is not set

CONFIG_INITRAMFS_SOURCE=""

CONFIG_INITRAMFS_SOURCE=""

CONFIG_UID16=y

CONFIG_UID16=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -44,10 +46,6 @@ CONFIG_BASE_FULL=y 
CONFIG_FUTEX=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y

CONFIG_EPOLL=y

CONFIG_SHMEM=y

CONFIG_SHMEM=y

CONFIG_CC_ALIGN_FUNCTIONS=0

CONFIG_CC_ALIGN_LABELS=0

CONFIG_CC_ALIGN_LOOPS=0

CONFIG_CC_ALIGN_JUMPS=0

CONFIG_SLAB=y

CONFIG_SLAB=y

# CONFIG_TINY_SHMEM is not set

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

CONFIG_BASE_SMALL=0
@@ -60,7 +58,6 @@ CONFIG_OBSOLETE_INTERMODULE=y 
CONFIG_MODULES=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_MODULE_FORCE_UNLOAD is not set

# CONFIG_MODULE_FORCE_UNLOAD is not set

CONFIG_OBSOLETE_MODPARM=y

# CONFIG_MODVERSIONS is not set

# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_KMOD=y

CONFIG_KMOD=y
@@ -68,6 +65,7 @@ CONFIG_KMOD=y 
#

#

# Block layer

# Block layer

#

#

# CONFIG_BLK_DEV_IO_TRACE is not set





#

#

# IO Schedulers

# IO Schedulers
@@ -89,11 +87,13 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_CO285 is not set

# CONFIG_ARCH_CO285 is not set

# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_EP93XX is not set

# CONFIG_ARCH_FOOTBRIDGE is not set

# CONFIG_ARCH_FOOTBRIDGE is not set

# CONFIG_ARCH_INTEGRATOR is not set

# CONFIG_ARCH_INTEGRATOR is not set

# CONFIG_ARCH_IOP3XX is not set

# CONFIG_ARCH_IOP3XX is not set

# CONFIG_ARCH_IXP4XX is not set

# CONFIG_ARCH_IXP4XX is not set

CONFIG_ARCH_IXP2000=y

CONFIG_ARCH_IXP2000=y

# CONFIG_ARCH_IXP23XX is not set

# CONFIG_ARCH_L7200 is not set

# CONFIG_ARCH_L7200 is not set

# CONFIG_ARCH_PXA is not set

# CONFIG_ARCH_PXA is not set

# CONFIG_ARCH_RPC is not set

# CONFIG_ARCH_RPC is not set
@@ -123,6 +123,7 @@ CONFIG_ARCH_IXDP2800=y 
CONFIG_ARCH_IXDP2X00=y

CONFIG_ARCH_IXDP2X00=y

CONFIG_ARCH_IXDP2401=y

CONFIG_ARCH_IXDP2401=y

CONFIG_ARCH_IXDP2801=y

CONFIG_ARCH_IXDP2801=y

CONFIG_MACH_IXDP28X5=y

CONFIG_ARCH_IXDP2X01=y

CONFIG_ARCH_IXDP2X01=y

# CONFIG_IXP2000_SUPPORT_BROKEN_PCI_IO is not set

# CONFIG_IXP2000_SUPPORT_BROKEN_PCI_IO is not set
@@ -147,7 +148,6 @@ CONFIG_XSCALE_PMU=y 
# Bus support

# Bus support

#

#

CONFIG_PCI=y

CONFIG_PCI=y

CONFIG_PCI_LEGACY_PROC=y

# CONFIG_PCI_DEBUG is not set

# CONFIG_PCI_DEBUG is not set





#

#
@@ -160,6 +160,7 @@ CONFIG_PCI_LEGACY_PROC=y 
#

#

# CONFIG_PREEMPT is not set

# CONFIG_PREEMPT is not set

# CONFIG_NO_IDLE_HZ is not set

# CONFIG_NO_IDLE_HZ is not set

CONFIG_HZ=100

# CONFIG_AEABI is not set

# CONFIG_AEABI is not set

# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set

# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_SELECT_MEMORY_MODEL=y
@@ -213,6 +214,7 @@ CONFIG_NET=y 
#

#

# Networking options

# Networking options

#

#

# CONFIG_NETDEBUG is not set

CONFIG_PACKET=y

CONFIG_PACKET=y

CONFIG_PACKET_MMAP=y

CONFIG_PACKET_MMAP=y

CONFIG_UNIX=y

CONFIG_UNIX=y
@@ -232,12 +234,15 @@ CONFIG_SYN_COOKIES=y 
# CONFIG_INET_AH is not set

# CONFIG_INET_AH is not set

# CONFIG_INET_ESP is not set

# CONFIG_INET_ESP is not set

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_XFRM_TUNNEL is not set

# CONFIG_INET_TUNNEL is not set

# CONFIG_INET_TUNNEL is not set

CONFIG_INET_DIAG=y

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_BIC=y

CONFIG_TCP_CONG_BIC=y

# CONFIG_IPV6 is not set

# CONFIG_IPV6 is not set

# CONFIG_INET6_XFRM_TUNNEL is not set

# CONFIG_INET6_TUNNEL is not set

# CONFIG_NETFILTER is not set

# CONFIG_NETFILTER is not set





#

#
@@ -347,7 +352,6 @@ CONFIG_MTD_CFI_UTIL=y 
# CONFIG_MTD_ROM is not set

# CONFIG_MTD_ROM is not set

# CONFIG_MTD_ABSENT is not set

# CONFIG_MTD_ABSENT is not set

# CONFIG_MTD_OBSOLETE_CHIPS is not set

# CONFIG_MTD_OBSOLETE_CHIPS is not set

# CONFIG_MTD_XIP is not set





#

#

# Mapping drivers for chip access

# Mapping drivers for chip access
@@ -366,7 +370,6 @@ CONFIG_MTD_IXP2000=y 
# CONFIG_MTD_SLRAM is not set

# CONFIG_MTD_SLRAM is not set

# CONFIG_MTD_PHRAM is not set

# CONFIG_MTD_PHRAM is not set

# CONFIG_MTD_MTDRAM is not set

# CONFIG_MTD_MTDRAM is not set

# CONFIG_MTD_BLKMTD is not set

# CONFIG_MTD_BLOCK2MTD is not set

# CONFIG_MTD_BLOCK2MTD is not set





#

#
@@ -614,8 +617,9 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 
#

#

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_PCI=y

CONFIG_SERIAL_8250_NR_UARTS=3

CONFIG_SERIAL_8250_NR_UARTS=3

CONFIG_SERIAL_8250_RUNTIME_UARTS=4

CONFIG_SERIAL_8250_RUNTIME_UARTS=3

# CONFIG_SERIAL_8250_EXTENDED is not set

# CONFIG_SERIAL_8250_EXTENDED is not set





#

#
@@ -623,6 +627,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 
#

#

CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

CONFIG_SERIAL_CORE_CONSOLE=y

# CONFIG_SERIAL_JSM is not set

CONFIG_UNIX98_PTYS=y

CONFIG_UNIX98_PTYS=y

CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTYS=y

CONFIG_LEGACY_PTY_COUNT=256

CONFIG_LEGACY_PTY_COUNT=256
@@ -650,7 +655,6 @@ CONFIG_IXP2000_WATCHDOG=y 
# CONFIG_PCIPCWATCHDOG is not set

# CONFIG_PCIPCWATCHDOG is not set

# CONFIG_WDTPCI is not set

# CONFIG_WDTPCI is not set

# CONFIG_NVRAM is not set

# CONFIG_NVRAM is not set

# CONFIG_RTC is not set

# CONFIG_DTLK is not set

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set

# CONFIG_APPLICOM is not set
@@ -696,7 +700,6 @@ CONFIG_I2C_IXP2000=y 
# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_PROSAVAGE is not set

# CONFIG_I2C_PROSAVAGE is not set

# CONFIG_I2C_SAVAGE4 is not set

# CONFIG_I2C_SAVAGE4 is not set

# CONFIG_SCx200_ACB is not set

# CONFIG_I2C_SIS5595 is not set

# CONFIG_I2C_SIS5595 is not set

# CONFIG_I2C_SIS630 is not set

# CONFIG_I2C_SIS630 is not set

# CONFIG_I2C_SIS96X is not set

# CONFIG_I2C_SIS96X is not set
@@ -715,9 +718,7 @@ CONFIG_SENSORS_EEPROM=y 
# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_RTC8564 is not set

# CONFIG_SENSORS_MAX6875 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_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_BUS is not set
@@ -729,6 +730,11 @@ CONFIG_SENSORS_EEPROM=y 
# CONFIG_SPI is not set

# CONFIG_SPI is not set

# CONFIG_SPI_MASTER is not set

# CONFIG_SPI_MASTER is not set





#

# Dallas's 1-wire bus

#

# CONFIG_W1 is not set



#

#

# Hardware Monitoring support

# Hardware Monitoring support

#

#
@@ -742,6 +748,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_ASB100 is not set

# CONFIG_SENSORS_ASB100 is not set

# CONFIG_SENSORS_ATXP1 is not set

# CONFIG_SENSORS_ATXP1 is not set

# CONFIG_SENSORS_DS1621 is not set

# CONFIG_SENSORS_DS1621 is not set

# CONFIG_SENSORS_F71805F is not set

# CONFIG_SENSORS_FSCHER is not set

# CONFIG_SENSORS_FSCHER is not set

# CONFIG_SENSORS_FSCPOS is not set

# CONFIG_SENSORS_FSCPOS is not set

# CONFIG_SENSORS_GL518SM is not set

# CONFIG_SENSORS_GL518SM is not set
@@ -776,7 +783,16 @@ CONFIG_HWMON=y 
#

#





#

#

# Multimedia Capabilities Port drivers

# LED devices

#

# CONFIG_NEW_LEDS is not set



#

# LED drivers

#



#

# LED Triggers

#

#





#

#
@@ -804,6 +820,7 @@ CONFIG_HWMON=y 
#

#

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y

CONFIG_USB_ARCH_HAS_OHCI=y

CONFIG_USB_ARCH_HAS_EHCI=y

# CONFIG_USB is not set

# CONFIG_USB is not set





#

#
@@ -820,6 +837,12 @@ CONFIG_USB_ARCH_HAS_OHCI=y 
#

#

# CONFIG_MMC is not set

# CONFIG_MMC is not set





#

# Real Time Clock

#

CONFIG_RTC_LIB=y

# CONFIG_RTC_CLASS is not set



#

#

# File systems

# File systems

#

#
@@ -870,7 +893,6 @@ CONFIG_SYSFS=y 
CONFIG_TMPFS=y

CONFIG_TMPFS=y

# CONFIG_HUGETLB_PAGE is not set

# CONFIG_HUGETLB_PAGE is not set

CONFIG_RAMFS=y

CONFIG_RAMFS=y

# CONFIG_RELAYFS_FS is not set

# CONFIG_CONFIGFS_FS is not set

# CONFIG_CONFIGFS_FS is not set





#

#
@@ -972,6 +994,7 @@ CONFIG_DEBUG_BUGVERBOSE=y 
# CONFIG_DEBUG_FS is not set

# CONFIG_DEBUG_FS is not set

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_VM is not set

CONFIG_FRAME_POINTER=y

CONFIG_FRAME_POINTER=y

# CONFIG_UNWIND_INFO is not set

CONFIG_FORCED_INLINING=y

CONFIG_FORCED_INLINING=y

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_RCU_TORTURE_TEST is not set

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_USER=y

arch/arm/configs/ixp23xx_defconfig

+30 −28
Original line number Original line Diff line number Diff line 
#

#

# Automatically generated make config: don't edit

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.16

# Linux kernel version: 2.6.17-rc2

# Tue Mar 21 03:27:20 2006

# Wed Apr 19 21:13:50 2006

#

#

CONFIG_ARM=y

CONFIG_ARM=y

CONFIG_MMU=y

CONFIG_MMU=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_VECTORS_BASE=0xffff0000





#

#

# Code maturity level options

# Code maturity level options
@@ -28,6 +30,7 @@ CONFIG_BSD_PROCESS_ACCT=y 
CONFIG_SYSCTL=y

CONFIG_SYSCTL=y

# CONFIG_AUDIT is not set

# CONFIG_AUDIT is not set

# CONFIG_IKCONFIG is not set

# CONFIG_IKCONFIG is not set

# CONFIG_RELAY is not set

CONFIG_INITRAMFS_SOURCE=""

CONFIG_INITRAMFS_SOURCE=""

CONFIG_UID16=y

CONFIG_UID16=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_CC_OPTIMIZE_FOR_SIZE=y
@@ -43,10 +46,6 @@ CONFIG_BASE_FULL=y 
CONFIG_FUTEX=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y

CONFIG_EPOLL=y

CONFIG_SHMEM=y

CONFIG_SHMEM=y

CONFIG_CC_ALIGN_FUNCTIONS=0

CONFIG_CC_ALIGN_LABELS=0

CONFIG_CC_ALIGN_LOOPS=0

CONFIG_CC_ALIGN_JUMPS=0

CONFIG_SLAB=y

CONFIG_SLAB=y

# CONFIG_TINY_SHMEM is not set

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

CONFIG_BASE_SMALL=0
@@ -59,7 +58,6 @@ CONFIG_OBSOLETE_INTERMODULE=y 
CONFIG_MODULES=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_UNLOAD=y

# CONFIG_MODULE_FORCE_UNLOAD is not set

# CONFIG_MODULE_FORCE_UNLOAD is not set

CONFIG_OBSOLETE_MODPARM=y

# CONFIG_MODVERSIONS is not set

# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_KMOD=y

CONFIG_KMOD=y
@@ -67,6 +65,7 @@ CONFIG_KMOD=y 
#

#

# Block layer

# Block layer

#

#

# CONFIG_BLK_DEV_IO_TRACE is not set





#

#

# IO Schedulers

# IO Schedulers
@@ -143,7 +142,6 @@ CONFIG_CPU_BIG_ENDIAN=y 
# Bus support

# Bus support

#

#

CONFIG_PCI=y

CONFIG_PCI=y

CONFIG_PCI_LEGACY_PROC=y

# CONFIG_PCI_DEBUG is not set

# CONFIG_PCI_DEBUG is not set





#

#
@@ -230,12 +228,15 @@ CONFIG_SYN_COOKIES=y 
# CONFIG_INET_AH is not set

# CONFIG_INET_AH is not set

# CONFIG_INET_ESP is not set

# CONFIG_INET_ESP is not set

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_XFRM_TUNNEL is not set

# CONFIG_INET_TUNNEL is not set

# CONFIG_INET_TUNNEL is not set

CONFIG_INET_DIAG=y

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_BIC=y

CONFIG_TCP_CONG_BIC=y

# CONFIG_IPV6 is not set

# CONFIG_IPV6 is not set

# CONFIG_INET6_XFRM_TUNNEL is not set

# CONFIG_INET6_TUNNEL is not set

# CONFIG_NETFILTER is not set

# CONFIG_NETFILTER is not set





#

#
@@ -365,7 +366,6 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1 
# CONFIG_MTD_SLRAM is not set

# CONFIG_MTD_SLRAM is not set

# CONFIG_MTD_PHRAM is not set

# CONFIG_MTD_PHRAM is not set

# CONFIG_MTD_MTDRAM is not set

# CONFIG_MTD_MTDRAM is not set

# CONFIG_MTD_BLKMTD is not set

# CONFIG_MTD_BLOCK2MTD is not set

# CONFIG_MTD_BLOCK2MTD is not set





#

#
@@ -527,7 +527,6 @@ CONFIG_BLK_DEV_SD=y 
# CONFIG_SCSI_INIA100 is not set

# CONFIG_SCSI_INIA100 is not set

# CONFIG_SCSI_SYM53C8XX_2 is not set

# CONFIG_SCSI_SYM53C8XX_2 is not set

# CONFIG_SCSI_IPR is not set

# CONFIG_SCSI_IPR is not set

# CONFIG_SCSI_QLOGIC_FC is not set

# CONFIG_SCSI_QLOGIC_1280 is not set

# CONFIG_SCSI_QLOGIC_1280 is not set

# CONFIG_SCSI_QLA_FC is not set

# CONFIG_SCSI_QLA_FC is not set

# CONFIG_SCSI_LPFC is not set

# CONFIG_SCSI_LPFC is not set
@@ -735,6 +734,7 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 
#

#

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_8250_PCI=y

CONFIG_SERIAL_8250_NR_UARTS=4

CONFIG_SERIAL_8250_NR_UARTS=4

CONFIG_SERIAL_8250_RUNTIME_UARTS=4

CONFIG_SERIAL_8250_RUNTIME_UARTS=4

# CONFIG_SERIAL_8250_EXTENDED is not set

# CONFIG_SERIAL_8250_EXTENDED is not set
@@ -776,7 +776,6 @@ CONFIG_WATCHDOG=y 
#

#

# CONFIG_USBPCWATCHDOG is not set

# CONFIG_USBPCWATCHDOG is not set

# CONFIG_NVRAM is not set

# CONFIG_NVRAM is not set

# CONFIG_RTC is not set

# CONFIG_DTLK is not set

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set

# CONFIG_APPLICOM is not set
@@ -821,7 +820,6 @@ CONFIG_I2C_ALGOBIT=y 
# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_PROSAVAGE is not set

# CONFIG_I2C_PROSAVAGE is not set

# CONFIG_I2C_SAVAGE4 is not set

# CONFIG_I2C_SAVAGE4 is not set

# CONFIG_SCx200_ACB is not set

# CONFIG_I2C_SIS5595 is not set

# CONFIG_I2C_SIS5595 is not set

# CONFIG_I2C_SIS630 is not set

# CONFIG_I2C_SIS630 is not set

# CONFIG_I2C_SIS96X is not set

# CONFIG_I2C_SIS96X is not set
@@ -840,9 +838,7 @@ CONFIG_SENSORS_EEPROM=y 
# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_RTC8564 is not set

# CONFIG_SENSORS_MAX6875 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_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_BUS is not set
@@ -907,7 +903,16 @@ CONFIG_HWMON=y 
#

#





#

#

# Multimedia Capabilities Port drivers

# LED devices

#

# CONFIG_NEW_LEDS is not set



#

# LED drivers

#



#

# LED Triggers

#

#





#

#
@@ -919,6 +924,7 @@ CONFIG_HWMON=y 
# Digital Video Broadcasting Devices

# Digital Video Broadcasting Devices

#

#

# CONFIG_DVB is not set

# CONFIG_DVB is not set

# CONFIG_USB_DABUSB is not set





#

#

# Graphics support

# Graphics support
@@ -935,6 +941,7 @@ CONFIG_HWMON=y 
#

#

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y

CONFIG_USB_ARCH_HAS_OHCI=y

CONFIG_USB_ARCH_HAS_EHCI=y

CONFIG_USB=y

CONFIG_USB=y

# CONFIG_USB_DEBUG is not set

# CONFIG_USB_DEBUG is not set
@@ -1000,9 +1007,7 @@ CONFIG_USB_STORAGE=y 
# CONFIG_USB_ACECAD is not set

# CONFIG_USB_ACECAD is not set

# CONFIG_USB_KBTAB is not set

# CONFIG_USB_KBTAB is not set

# CONFIG_USB_POWERMATE is not set

# CONFIG_USB_POWERMATE is not set

# CONFIG_USB_MTOUCH is not set

# CONFIG_USB_TOUCHSCREEN is not set

# CONFIG_USB_ITMTOUCH is not set

# CONFIG_USB_EGALAX is not set

# CONFIG_USB_YEALINK is not set

# CONFIG_USB_YEALINK is not set

# CONFIG_USB_XPAD is not set

# CONFIG_USB_XPAD is not set

# CONFIG_USB_ATI_REMOTE is not set

# CONFIG_USB_ATI_REMOTE is not set
@@ -1016,15 +1021,6 @@ CONFIG_USB_STORAGE=y 
# CONFIG_USB_MDC800 is not set

# CONFIG_USB_MDC800 is not set

# CONFIG_USB_MICROTEK is not set

# CONFIG_USB_MICROTEK is not set





#

# USB Multimedia devices

#

# CONFIG_USB_DABUSB is not set



#

# Video4Linux support is needed for USB Multimedia device support

#



#

#

# USB Network Adapters

# USB Network Adapters

#

#
@@ -1075,6 +1071,12 @@ CONFIG_USB_MON=y 
#

#

# CONFIG_MMC is not set

# CONFIG_MMC is not set





#

# Real Time Clock

#

CONFIG_RTC_LIB=y

# CONFIG_RTC_CLASS is not set



#

#

# File systems

# File systems

#

#
@@ -1127,7 +1129,6 @@ CONFIG_SYSFS=y 
CONFIG_TMPFS=y

CONFIG_TMPFS=y

# CONFIG_HUGETLB_PAGE is not set

# CONFIG_HUGETLB_PAGE is not set

CONFIG_RAMFS=y

CONFIG_RAMFS=y

# CONFIG_RELAYFS_FS is not set

# CONFIG_CONFIGFS_FS is not set

# CONFIG_CONFIGFS_FS is not set





#

#
@@ -1268,6 +1269,7 @@ CONFIG_DEBUG_BUGVERBOSE=y 
# CONFIG_DEBUG_FS is not set

# CONFIG_DEBUG_FS is not set

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_VM is not set

CONFIG_FRAME_POINTER=y

CONFIG_FRAME_POINTER=y

# CONFIG_UNWIND_INFO is not set

CONFIG_FORCED_INLINING=y

CONFIG_FORCED_INLINING=y

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_RCU_TORTURE_TEST is not set

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_USER=y