Commit a23f4636 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] arch/arm/kernel/bios32.c: no need to set isa_bridge
  [ARM] 3729/3: EABI padding rules necessitate the packed attribute of floatx80
  [ARM] 3725/1: sharpsl_pm: warn about wrong temperature
  [ARM] 3723/1: collie charging
  [ARM] 3728/1: Restore missing CPU Hotplug irq helper
  [ARM] 3727/1: fix ucb initialization on collie
  [ARM] Allow Versatile to be built for AB and PB
  [ARM] 3726/1: update {ep93xx,ixp2000,ixp23xx,lpd270,onearm} defconfigs to 2.6.18-rc1
  [ARM] 3721/1: Small cleanup for locomo.c
parents fc818301 5cbc1b6f

arch/arm/common/locomo.c

+1 −2
Original line number Diff line number Diff line
@@ -729,7 +729,6 @@ __locomo_probe(struct device *me, struct resource *mem, int irq) 


	for (i = 0; i < ARRAY_SIZE(locomo_devices); i++)

		locomo_init_one_child(lchip, &locomo_devices[i]);



	return 0;



 out:

arch/arm/common/sharpsl_pm.c

+3 −1
Original line number Diff line number Diff line
@@ -412,8 +412,10 @@ static int sharpsl_check_battery_temp(void) 
	val = get_select_val(buff);



	dev_dbg(sharpsl_pm.dev, "Temperature: %d\n", val);

	if (val > sharpsl_pm.machinfo->charge_on_temp)

	if (val > sharpsl_pm.machinfo->charge_on_temp) {

		printk(KERN_WARNING "Not charging: temperature out of limits.\n");

		return -1;

	}



	return 0;

}

arch/arm/configs/ep93xx_defconfig

+56 −12
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.17-rc2

# Wed Apr 19 21:21:01 2006

# Linux kernel version: 2.6.18-rc1

# Sun Jul  9 15:21:30 2006

#

CONFIG_ARM=y

CONFIG_MMU=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_HARDIRQS_SW_RESEND=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_VECTORS_BASE=0xffff0000

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"



#

# Code maturity level options
@@ -43,14 +47,15 @@ CONFIG_PRINTK=y 
CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_BASE_FULL=y

CONFIG_RT_MUTEXES=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y

CONFIG_SHMEM=y

CONFIG_SLAB=y

CONFIG_VM_EVENT_COUNTERS=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

# CONFIG_SLOB is not set

CONFIG_OBSOLETE_INTERMODULE=y



#

# Loadable module support
@@ -83,18 +88,26 @@ CONFIG_DEFAULT_IOSCHED="deadline" 
#

# System Type

#

# CONFIG_ARCH_AAEC2000 is not set

# CONFIG_ARCH_INTEGRATOR is not set

# CONFIG_ARCH_REALVIEW is not set

# CONFIG_ARCH_VERSATILE is not set

# CONFIG_ARCH_AT91 is not set

# CONFIG_ARCH_CLPS7500 is not set

# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_CO285 is not set

# CONFIG_ARCH_EBSA110 is not set

CONFIG_ARCH_EP93XX=y

# CONFIG_ARCH_FOOTBRIDGE is not set

# CONFIG_ARCH_INTEGRATOR is not set

# CONFIG_ARCH_NETX is not set

# CONFIG_ARCH_H720X is not set

# CONFIG_ARCH_IMX is not set

# CONFIG_ARCH_IOP3XX is not set

# CONFIG_ARCH_IXP4XX is not set

# CONFIG_ARCH_IXP2000 is not set

# CONFIG_ARCH_IXP23XX is not set

# CONFIG_ARCH_L7200 is not set

# CONFIG_ARCH_PNX4008 is not set

# CONFIG_ARCH_PXA is not set

# CONFIG_ARCH_RPC is not set

# CONFIG_ARCH_SA1100 is not set
@@ -102,20 +115,18 @@ CONFIG_ARCH_EP93XX=y 
# CONFIG_ARCH_SHARK is not set

# 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

# CONFIG_ARCH_AT91RM9200 is not set



#

# Cirrus EP93xx Implementation Options

#

CONFIG_CRUNCH=y



#

# EP93xx Platforms

#

CONFIG_MACH_EDB9302=y

CONFIG_MACH_EDB9315=y

CONFIG_MACH_EDB9315A=y

CONFIG_MACH_GESBC9312=y

CONFIG_MACH_TS72XX=y
@@ -166,6 +177,7 @@ CONFIG_FLATMEM=y 
CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPLIT_PTLOCK_CPUS=4096

# CONFIG_RESOURCES_64BIT is not set

CONFIG_ALIGNMENT_TRAP=y



#
@@ -233,6 +245,8 @@ CONFIG_SYN_COOKIES=y 
# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_XFRM_TUNNEL is not set

# CONFIG_INET_TUNNEL is not set

CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set
@@ -240,6 +254,7 @@ CONFIG_TCP_CONG_BIC=y 
# CONFIG_IPV6 is not set

# CONFIG_INET6_XFRM_TUNNEL is not set

# CONFIG_INET6_TUNNEL is not set

# CONFIG_NETWORK_SECMARK is not set

# CONFIG_NETFILTER is not set



#
@@ -294,6 +309,7 @@ CONFIG_STANDALONE=y 
CONFIG_PREVENT_FIRMWARE_BUILD=y

# CONFIG_FW_LOADER is not set

# CONFIG_DEBUG_DRIVER is not set

# CONFIG_SYS_HYPERVISOR is not set



#

# Connector - unified userspace <-> kernelspace linker
@@ -386,6 +402,8 @@ CONFIG_MTD_PHYSMAP_BANKWIDTH=1 
#

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_VERIFY_WRITE=y

# CONFIG_MTD_NAND_ECC_SMC is not set

CONFIG_MTD_NAND_TS7250=y

CONFIG_MTD_NAND_IDS=y

# CONFIG_MTD_NAND_DISKONCHIP is not set

# CONFIG_MTD_NAND_NANDSIM is not set
@@ -582,6 +600,7 @@ CONFIG_EP93XX_WATCHDOG=y 
# USB-based Watchdog Cards

#

# CONFIG_USBPCWATCHDOG is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_NVRAM is not set

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set
@@ -613,6 +632,7 @@ CONFIG_I2C_ALGOBIT=y 
#

# I2C Hardware Bus support

#

# CONFIG_I2C_OCORES is not set

# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_STUB is not set

# CONFIG_I2C_PCA_ISA is not set
@@ -641,13 +661,13 @@ CONFIG_I2C_DEBUG_CHIP=y 
#

# Dallas's 1-wire bus

#

# CONFIG_W1 is not set



#

# Hardware Monitoring support

#

CONFIG_HWMON=y

# CONFIG_HWMON_VID is not set

# CONFIG_SENSORS_ABITUGURU is not set

# CONFIG_SENSORS_ADM1021 is not set

# CONFIG_SENSORS_ADM1025 is not set

# CONFIG_SENSORS_ADM1026 is not set
@@ -675,8 +695,10 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_MAX1619 is not set

# CONFIG_SENSORS_PC87360 is not set

# CONFIG_SENSORS_SMSC47M1 is not set

# CONFIG_SENSORS_SMSC47M192 is not set

# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_W83781D is not set

# CONFIG_SENSORS_W83791D is not set

# CONFIG_SENSORS_W83792D is not set

# CONFIG_SENSORS_W83L785TS is not set

# CONFIG_SENSORS_W83627HF is not set
@@ -704,6 +726,7 @@ CONFIG_HWMON=y 
# Multimedia devices

#

# CONFIG_VIDEO_DEV is not set

CONFIG_VIDEO_V4L2=y



#

# Digital Video Broadcasting Devices
@@ -714,6 +737,7 @@ CONFIG_HWMON=y 
#

# Graphics support

#

# CONFIG_FIRMWARE_EDID is not set

# CONFIG_FB is not set



#
@@ -806,6 +830,7 @@ CONFIG_USB_SERIAL_CONSOLE=y 
# CONFIG_USB_SERIAL_GENERIC is not set

# CONFIG_USB_SERIAL_AIRPRIME is not set

# CONFIG_USB_SERIAL_ANYDATA is not set

# CONFIG_USB_SERIAL_ARK3116 is not set

# CONFIG_USB_SERIAL_BELKIN is not set

# CONFIG_USB_SERIAL_WHITEHEAT is not set

# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set
@@ -833,6 +858,7 @@ CONFIG_USB_SERIAL_PL2303=y 
# CONFIG_USB_SERIAL_TI is not set

# CONFIG_USB_SERIAL_CYBERJACK is not set

# CONFIG_USB_SERIAL_XIRCOM is not set

# CONFIG_USB_SERIAL_OPTION is not set

# CONFIG_USB_SERIAL_OMNINET is not set



#
@@ -845,10 +871,12 @@ CONFIG_USB_SERIAL_PL2303=y 
# CONFIG_USB_LEGOTOWER is not set

# CONFIG_USB_LCD is not set

# CONFIG_USB_LED is not set

# CONFIG_USB_CY7C63 is not set

# CONFIG_USB_CYTHERM is not set

# CONFIG_USB_PHIDGETKIT is not set

# CONFIG_USB_PHIDGETSERVO is not set

# CONFIG_USB_IDMOUSE is not set

# CONFIG_USB_APPLEDISPLAY is not set

# CONFIG_USB_LD is not set

# CONFIG_USB_TEST is not set
@@ -880,17 +908,24 @@ CONFIG_RTC_HCTOSYS_DEVICE="rtc0" 
CONFIG_RTC_INTF_SYSFS=y

CONFIG_RTC_INTF_PROC=y

CONFIG_RTC_INTF_DEV=y

# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set



#

# RTC drivers

#

# CONFIG_RTC_DRV_X1205 is not set

# CONFIG_RTC_DRV_DS1307 is not set

# CONFIG_RTC_DRV_DS1553 is not set

# CONFIG_RTC_DRV_DS1672 is not set

# CONFIG_RTC_DRV_DS1742 is not set

# CONFIG_RTC_DRV_PCF8563 is not set

# CONFIG_RTC_DRV_PCF8583 is not set

# CONFIG_RTC_DRV_RS5C372 is not set

CONFIG_RTC_DRV_M48T86=y

CONFIG_RTC_DRV_EP93XX=y

# CONFIG_RTC_DRV_PL031 is not set

# CONFIG_RTC_DRV_TEST is not set

# CONFIG_RTC_DRV_V3020 is not set



#

# File systems
@@ -910,6 +945,7 @@ CONFIG_JBD=y 
# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set

CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y

# CONFIG_QUOTA is not set

CONFIG_DNOTIFY=y

# CONFIG_AUTOFS_FS is not set
@@ -957,6 +993,7 @@ CONFIG_JFFS2_FS=y 
CONFIG_JFFS2_FS_DEBUG=0

CONFIG_JFFS2_FS_WRITEBUFFER=y

# CONFIG_JFFS2_SUMMARY is not set

# CONFIG_JFFS2_FS_XATTR is not set

# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set

CONFIG_JFFS2_ZLIB=y

CONFIG_JFFS2_RTIME=y
@@ -986,6 +1023,7 @@ CONFIG_SUNRPC=y 
# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set

# CONFIG_CIFS is not set

# CONFIG_CIFS_DEBUG2 is not set

# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set

# CONFIG_AFS_FS is not set
@@ -1066,15 +1104,20 @@ CONFIG_NLS_ISO8859_1=y 
#

# CONFIG_PRINTK_TIME is not set

CONFIG_MAGIC_SYSRQ=y

# CONFIG_UNUSED_SYMBOLS is not set

CONFIG_DEBUG_KERNEL=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_SCHEDSTATS is not set

CONFIG_DEBUG_SLAB=y

# CONFIG_DEBUG_SLAB_LEAK is not set

CONFIG_DEBUG_MUTEXES=y

# CONFIG_DEBUG_RT_MUTEXES is not set

# CONFIG_RT_MUTEX_TESTER is not set

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

# CONFIG_DEBUG_RWSEMS is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

# CONFIG_DEBUG_KOBJECT is not set

CONFIG_DEBUG_BUGVERBOSE=y

# CONFIG_DEBUG_INFO is not set
@@ -1114,3 +1157,4 @@ CONFIG_CRC32=y 
CONFIG_LIBCRC32C=y

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=y

CONFIG_PLIST=y

arch/arm/configs/ixp2000_defconfig

+42 −13
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.17-rc2

# Wed Apr 19 21:12:49 2006

# Linux kernel version: 2.6.18-rc1

# Sun Jul  9 15:28:50 2006

#

CONFIG_ARM=y

CONFIG_MMU=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_HARDIRQS_SW_RESEND=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_VECTORS_BASE=0xffff0000

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"



#

# Code maturity level options
@@ -43,14 +47,15 @@ CONFIG_PRINTK=y 
CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_BASE_FULL=y

CONFIG_RT_MUTEXES=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y

CONFIG_SHMEM=y

CONFIG_SLAB=y

CONFIG_VM_EVENT_COUNTERS=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

# CONFIG_SLOB is not set

CONFIG_OBSOLETE_INTERMODULE=y



#

# Loadable module support
@@ -83,18 +88,26 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
#

# System Type

#

# CONFIG_ARCH_AAEC2000 is not set

# CONFIG_ARCH_INTEGRATOR is not set

# CONFIG_ARCH_REALVIEW is not set

# CONFIG_ARCH_VERSATILE is not set

# CONFIG_ARCH_AT91 is not set

# CONFIG_ARCH_CLPS7500 is not set

# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_CO285 is not set

# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_EP93XX is not set

# CONFIG_ARCH_FOOTBRIDGE is not set

# CONFIG_ARCH_INTEGRATOR is not set

# CONFIG_ARCH_NETX is not set

# CONFIG_ARCH_H720X is not set

# CONFIG_ARCH_IMX is not set

# CONFIG_ARCH_IOP3XX is not set

# CONFIG_ARCH_IXP4XX is not set

CONFIG_ARCH_IXP2000=y

# CONFIG_ARCH_IXP23XX is not set

# CONFIG_ARCH_L7200 is not set

# CONFIG_ARCH_PNX4008 is not set

# CONFIG_ARCH_PXA is not set

# CONFIG_ARCH_RPC is not set

# CONFIG_ARCH_SA1100 is not set
@@ -102,12 +115,6 @@ CONFIG_ARCH_IXP2000=y 
# CONFIG_ARCH_SHARK is not set

# 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

# CONFIG_ARCH_AT91RM9200 is not set

CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y



#
@@ -171,6 +178,7 @@ CONFIG_FLATMEM=y 
CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPLIT_PTLOCK_CPUS=4096

# CONFIG_RESOURCES_64BIT is not set

CONFIG_ALIGNMENT_TRAP=y



#
@@ -218,6 +226,8 @@ CONFIG_NET=y 
CONFIG_PACKET=y

CONFIG_PACKET_MMAP=y

CONFIG_UNIX=y

CONFIG_XFRM=y

# CONFIG_XFRM_USER is not set

# CONFIG_NET_KEY is not set

CONFIG_INET=y

# CONFIG_IP_MULTICAST is not set
@@ -236,6 +246,8 @@ CONFIG_SYN_COOKIES=y 
# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_XFRM_TUNNEL is not set

# CONFIG_INET_TUNNEL is not set

CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set
@@ -243,6 +255,7 @@ CONFIG_TCP_CONG_BIC=y 
# CONFIG_IPV6 is not set

# CONFIG_INET6_XFRM_TUNNEL is not set

# CONFIG_INET6_TUNNEL is not set

# CONFIG_NETWORK_SECMARK is not set

# CONFIG_NETFILTER is not set



#
@@ -297,6 +310,7 @@ CONFIG_STANDALONE=y 
# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FW_LOADER is not set

# CONFIG_DEBUG_DRIVER is not set

# CONFIG_SYS_HYPERVISOR is not set



#

# Connector - unified userspace <-> kernelspace linker
@@ -525,6 +539,7 @@ CONFIG_ENP2611_MSF_NET=y 
# CONFIG_CHELSIO_T1 is not set

# CONFIG_IXGB is not set

# CONFIG_S2IO is not set

# CONFIG_MYRI10GE is not set



#

# Token Ring devices
@@ -542,7 +557,6 @@ CONFIG_ENP2611_MSF_NET=y 
CONFIG_WAN=y

# CONFIG_DSCC4 is not set

# CONFIG_LANMEDIA is not set

# CONFIG_SYNCLINK_SYNCPPP is not set

CONFIG_HDLC=y

CONFIG_HDLC_RAW=y

# CONFIG_HDLC_RAW_ETH is not set
@@ -654,6 +668,7 @@ CONFIG_IXP2000_WATCHDOG=y 
#

# CONFIG_PCIPCWATCHDOG is not set

# CONFIG_WDTPCI is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_NVRAM is not set

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set
@@ -697,6 +712,7 @@ CONFIG_I2C_ALGOBIT=y 
# CONFIG_I2C_PIIX4 is not set

CONFIG_I2C_IXP2000=y

# CONFIG_I2C_NFORCE2 is not set

# CONFIG_I2C_OCORES is not set

# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_PROSAVAGE is not set

# CONFIG_I2C_SAVAGE4 is not set
@@ -733,13 +749,13 @@ CONFIG_SENSORS_EEPROM=y 
#

# Dallas's 1-wire bus

#

# CONFIG_W1 is not set



#

# Hardware Monitoring support

#

CONFIG_HWMON=y

# CONFIG_HWMON_VID is not set

# CONFIG_SENSORS_ABITUGURU is not set

# CONFIG_SENSORS_ADM1021 is not set

# CONFIG_SENSORS_ADM1025 is not set

# CONFIG_SENSORS_ADM1026 is not set
@@ -768,10 +784,12 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_PC87360 is not set

# CONFIG_SENSORS_SIS5595 is not set

# CONFIG_SENSORS_SMSC47M1 is not set

# CONFIG_SENSORS_SMSC47M192 is not set

# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_VIA686A is not set

# CONFIG_SENSORS_VT8231 is not set

# CONFIG_SENSORS_W83781D is not set

# CONFIG_SENSORS_W83791D is not set

# CONFIG_SENSORS_W83792D is not set

# CONFIG_SENSORS_W83L785TS is not set

# CONFIG_SENSORS_W83627HF is not set
@@ -799,6 +817,7 @@ CONFIG_HWMON=y 
# Multimedia devices

#

# CONFIG_VIDEO_DEV is not set

CONFIG_VIDEO_V4L2=y



#

# Digital Video Broadcasting Devices
@@ -808,6 +827,7 @@ CONFIG_HWMON=y 
#

# Graphics support

#

# CONFIG_FIRMWARE_EDID is not set

# CONFIG_FB is not set



#
@@ -866,6 +886,7 @@ CONFIG_FS_POSIX_ACL=y 
# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set

CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y

# CONFIG_QUOTA is not set

CONFIG_DNOTIFY=y

# CONFIG_AUTOFS_FS is not set
@@ -910,6 +931,7 @@ CONFIG_JFFS2_FS=y 
CONFIG_JFFS2_FS_DEBUG=0

CONFIG_JFFS2_FS_WRITEBUFFER=y

# CONFIG_JFFS2_SUMMARY is not set

# CONFIG_JFFS2_FS_XATTR is not set

# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set

CONFIG_JFFS2_ZLIB=y

CONFIG_JFFS2_RTIME=y
@@ -939,6 +961,7 @@ CONFIG_SUNRPC=y 
# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set

# CONFIG_CIFS is not set

# CONFIG_CIFS_DEBUG2 is not set

# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set

# CONFIG_AFS_FS is not set
@@ -980,14 +1003,19 @@ CONFIG_MSDOS_PARTITION=y 
#

# CONFIG_PRINTK_TIME is not set

CONFIG_MAGIC_SYSRQ=y

# CONFIG_UNUSED_SYMBOLS is not set

CONFIG_DEBUG_KERNEL=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

CONFIG_DEBUG_MUTEXES=y

# CONFIG_DEBUG_RT_MUTEXES is not set

# CONFIG_RT_MUTEX_TESTER is not set

# CONFIG_DEBUG_SPINLOCK is not set

CONFIG_DEBUG_MUTEXES=y

# CONFIG_DEBUG_RWSEMS is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

# CONFIG_DEBUG_KOBJECT is not set

CONFIG_DEBUG_BUGVERBOSE=y

# CONFIG_DEBUG_INFO is not set
@@ -1027,3 +1055,4 @@ CONFIG_CRC32=y 
# CONFIG_LIBCRC32C is not set

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=y

CONFIG_PLIST=y

arch/arm/configs/ixp23xx_defconfig

+46 −13
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.17-rc2

# Wed Apr 19 21:13:50 2006

# Linux kernel version: 2.6.18-rc1

# Sun Jul  9 14:13:35 2006

#

CONFIG_ARM=y

CONFIG_MMU=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_HARDIRQS_SW_RESEND=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_VECTORS_BASE=0xffff0000

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"



#

# Code maturity level options
@@ -43,14 +47,15 @@ CONFIG_PRINTK=y 
CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_BASE_FULL=y

CONFIG_RT_MUTEXES=y

CONFIG_FUTEX=y

CONFIG_EPOLL=y

CONFIG_SHMEM=y

CONFIG_SLAB=y

CONFIG_VM_EVENT_COUNTERS=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

# CONFIG_SLOB is not set

CONFIG_OBSOLETE_INTERMODULE=y



#

# Loadable module support
@@ -83,18 +88,26 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
#

# System Type

#

# CONFIG_ARCH_AAEC2000 is not set

# CONFIG_ARCH_INTEGRATOR is not set

# CONFIG_ARCH_REALVIEW is not set

# CONFIG_ARCH_VERSATILE is not set

# CONFIG_ARCH_AT91 is not set

# CONFIG_ARCH_CLPS7500 is not set

# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_CO285 is not set

# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_EP93XX is not set

# CONFIG_ARCH_FOOTBRIDGE is not set

# CONFIG_ARCH_INTEGRATOR is not set

# CONFIG_ARCH_NETX is not set

# CONFIG_ARCH_H720X is not set

# CONFIG_ARCH_IMX is not set

# CONFIG_ARCH_IOP3XX is not set

# CONFIG_ARCH_IXP4XX is not set

# CONFIG_ARCH_IXP2000 is not set

CONFIG_ARCH_IXP23XX=y

# CONFIG_ARCH_L7200 is not set

# CONFIG_ARCH_PNX4008 is not set

# CONFIG_ARCH_PXA is not set

# CONFIG_ARCH_RPC is not set

# CONFIG_ARCH_SA1100 is not set
@@ -102,12 +115,6 @@ CONFIG_ARCH_IXP23XX=y 
# CONFIG_ARCH_SHARK is not set

# 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

# CONFIG_ARCH_AT91RM9200 is not set

CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y



#
@@ -165,6 +172,7 @@ CONFIG_FLATMEM=y 
CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPLIT_PTLOCK_CPUS=4096

CONFIG_RESOURCES_64BIT=y

CONFIG_ALIGNMENT_TRAP=y



#
@@ -212,6 +220,8 @@ CONFIG_NET=y 
CONFIG_PACKET=y

CONFIG_PACKET_MMAP=y

CONFIG_UNIX=y

CONFIG_XFRM=y

# CONFIG_XFRM_USER is not set

# CONFIG_NET_KEY is not set

CONFIG_INET=y

# CONFIG_IP_MULTICAST is not set
@@ -230,6 +240,8 @@ CONFIG_SYN_COOKIES=y 
# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_XFRM_TUNNEL is not set

# CONFIG_INET_TUNNEL is not set

CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

CONFIG_INET_DIAG=y

CONFIG_INET_TCP_DIAG=y

# CONFIG_TCP_CONG_ADVANCED is not set
@@ -237,6 +249,7 @@ CONFIG_TCP_CONG_BIC=y 
# CONFIG_IPV6 is not set

# CONFIG_INET6_XFRM_TUNNEL is not set

# CONFIG_INET6_TUNNEL is not set

# CONFIG_NETWORK_SECMARK is not set

# CONFIG_NETFILTER is not set



#
@@ -291,6 +304,7 @@ CONFIG_STANDALONE=y 
# CONFIG_PREVENT_FIRMWARE_BUILD is not set

# CONFIG_FW_LOADER is not set

# CONFIG_DEBUG_DRIVER is not set

# CONFIG_SYS_HYPERVISOR is not set



#

# Connector - unified userspace <-> kernelspace linker
@@ -520,6 +534,7 @@ CONFIG_BLK_DEV_SD=y 
# CONFIG_MEGARAID_LEGACY is not set

# CONFIG_MEGARAID_SAS is not set

# CONFIG_SCSI_SATA is not set

# CONFIG_SCSI_HPTIOP is not set

# CONFIG_SCSI_DMX3191D is not set

# CONFIG_SCSI_FUTURE_DOMAIN is not set

# CONFIG_SCSI_IPS is not set
@@ -641,6 +656,7 @@ CONFIG_E1000_NAPI=y 
# CONFIG_CHELSIO_T1 is not set

# CONFIG_IXGB is not set

# CONFIG_S2IO is not set

# CONFIG_MYRI10GE is not set



#

# Token Ring devices
@@ -658,7 +674,6 @@ CONFIG_E1000_NAPI=y 
CONFIG_WAN=y

# CONFIG_DSCC4 is not set

# CONFIG_LANMEDIA is not set

# CONFIG_SYNCLINK_SYNCPPP is not set

CONFIG_HDLC=y

CONFIG_HDLC_RAW=y

# CONFIG_HDLC_RAW_ETH is not set
@@ -775,6 +790,7 @@ CONFIG_WATCHDOG=y 
# USB-based Watchdog Cards

#

# CONFIG_USBPCWATCHDOG is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_NVRAM is not set

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set
@@ -817,6 +833,7 @@ CONFIG_I2C_ALGOBIT=y 
# CONFIG_I2C_I810 is not set

# CONFIG_I2C_PIIX4 is not set

# CONFIG_I2C_NFORCE2 is not set

# CONFIG_I2C_OCORES is not set

# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_PROSAVAGE is not set

# CONFIG_I2C_SAVAGE4 is not set
@@ -853,13 +870,13 @@ CONFIG_SENSORS_EEPROM=y 
#

# Dallas's 1-wire bus

#

# CONFIG_W1 is not set



#

# Hardware Monitoring support

#

CONFIG_HWMON=y

# CONFIG_HWMON_VID is not set

# CONFIG_SENSORS_ABITUGURU is not set

# CONFIG_SENSORS_ADM1021 is not set

# CONFIG_SENSORS_ADM1025 is not set

# CONFIG_SENSORS_ADM1026 is not set
@@ -888,10 +905,12 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_PC87360 is not set

# CONFIG_SENSORS_SIS5595 is not set

# CONFIG_SENSORS_SMSC47M1 is not set

# CONFIG_SENSORS_SMSC47M192 is not set

# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_VIA686A is not set

# CONFIG_SENSORS_VT8231 is not set

# CONFIG_SENSORS_W83781D is not set

# CONFIG_SENSORS_W83791D is not set

# CONFIG_SENSORS_W83792D is not set

# CONFIG_SENSORS_W83L785TS is not set

# CONFIG_SENSORS_W83627HF is not set
@@ -919,6 +938,7 @@ CONFIG_HWMON=y 
# Multimedia devices

#

# CONFIG_VIDEO_DEV is not set

CONFIG_VIDEO_V4L2=y



#

# Digital Video Broadcasting Devices
@@ -929,6 +949,7 @@ CONFIG_HWMON=y 
#

# Graphics support

#

# CONFIG_FIRMWARE_EDID is not set

# CONFIG_FB is not set



#
@@ -959,6 +980,7 @@ CONFIG_USB=y 
CONFIG_USB_EHCI_HCD=y

# CONFIG_USB_EHCI_SPLIT_ISO is not set

# CONFIG_USB_EHCI_ROOT_HUB_TT is not set

# CONFIG_USB_EHCI_TT_NEWSCHED is not set

# CONFIG_USB_ISP116X_HCD is not set

CONFIG_USB_OHCI_HCD=y

# CONFIG_USB_OHCI_BIG_ENDIAN is not set
@@ -1050,10 +1072,12 @@ CONFIG_USB_MON=y 
# CONFIG_USB_LEGOTOWER is not set

# CONFIG_USB_LCD is not set

# CONFIG_USB_LED is not set

# CONFIG_USB_CY7C63 is not set

# CONFIG_USB_CYTHERM is not set

# CONFIG_USB_PHIDGETKIT is not set

# CONFIG_USB_PHIDGETSERVO is not set

# CONFIG_USB_IDMOUSE is not set

# CONFIG_USB_APPLEDISPLAY is not set

# CONFIG_USB_SISUSBVGA is not set

# CONFIG_USB_LD is not set
@@ -1100,6 +1124,7 @@ CONFIG_FS_POSIX_ACL=y 
# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set

CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y

# CONFIG_QUOTA is not set

CONFIG_DNOTIFY=y

# CONFIG_AUTOFS_FS is not set
@@ -1146,6 +1171,7 @@ CONFIG_JFFS2_FS=y 
CONFIG_JFFS2_FS_DEBUG=0

CONFIG_JFFS2_FS_WRITEBUFFER=y

# CONFIG_JFFS2_SUMMARY is not set

# CONFIG_JFFS2_FS_XATTR is not set

# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set

CONFIG_JFFS2_ZLIB=y

CONFIG_JFFS2_RTIME=y
@@ -1175,6 +1201,7 @@ CONFIG_SUNRPC=y 
# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set

# CONFIG_CIFS is not set

# CONFIG_CIFS_DEBUG2 is not set

# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set

# CONFIG_AFS_FS is not set
@@ -1255,14 +1282,19 @@ CONFIG_NLS_CODEPAGE_437=y 
#

# CONFIG_PRINTK_TIME is not set

CONFIG_MAGIC_SYSRQ=y

# CONFIG_UNUSED_SYMBOLS is not set

CONFIG_DEBUG_KERNEL=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_DEBUG_SLAB is not set

CONFIG_DEBUG_MUTEXES=y

# CONFIG_DEBUG_RT_MUTEXES is not set

# CONFIG_RT_MUTEX_TESTER is not set

# CONFIG_DEBUG_SPINLOCK is not set

CONFIG_DEBUG_MUTEXES=y

# CONFIG_DEBUG_RWSEMS is not set

# CONFIG_DEBUG_SPINLOCK_SLEEP is not set

# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set

# CONFIG_DEBUG_KOBJECT is not set

CONFIG_DEBUG_BUGVERBOSE=y

# CONFIG_DEBUG_INFO is not set
@@ -1302,3 +1334,4 @@ CONFIG_CRC32=y 
# CONFIG_LIBCRC32C is not set

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=y

CONFIG_PLIST=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE