Commit 57eb06e5 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] 4634/1: DaVinci GPIO header build fix
  [ARM] 4636/1: pxa: add default configuration for zylonite
  [ARM] 4635/1: pxa: Change Eric Miao's email address to eric.miao@marvell.com
  [ARM] Fix assignment instead of condition in arm/mach-omap2/clock.c
  [ARM] nommu: fix breakage caused by f9720205
  [ARM] pxa: shut up CLOCK_EVT_MODE_RESUME warning
  [ARM] Fix FIQ issue with ARM926
  [ARM] Fix pxamci regression
  [ARM] Fix netx_defconfig regression
  [ARM] Fix ateb9200_defconfig build regression
  [ARM] Fix an rpc_defconfig regression
  [ARM] Fix omap_h2_1610_defconfig regressions
  [ARM] 4632/1: Fix a typo in include/asm-arm/plat-s3c/regs-nand.h
parents 2ed45b07 558de8a7

arch/arm/configs/zylonite_defconfig

0 → 100644
+736 −0
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.23

# Tue Oct 23 13:33:20 2007

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y

CONFIG_GENERIC_GPIO=y

CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_MMU=y

# CONFIG_NO_IOPORT is not set

CONFIG_GENERIC_HARDIRQS=y

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_LOCKDEP_SUPPORT=y

CONFIG_TRACE_IRQFLAGS_SUPPORT=y

CONFIG_HARDIRQS_SW_RESEND=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

# CONFIG_ARCH_HAS_ILOG2_U32 is not set

# CONFIG_ARCH_HAS_ILOG2_U64 is not set

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_ZONE_DMA=y

CONFIG_ARCH_MTD_XIP=y

CONFIG_VECTORS_BASE=0xffff0000

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



#

# General setup

#

CONFIG_EXPERIMENTAL=y

CONFIG_BROKEN_ON_SMP=y

CONFIG_INIT_ENV_ARG_LIMIT=32

CONFIG_LOCALVERSION=""

CONFIG_LOCALVERSION_AUTO=y

CONFIG_SWAP=y

CONFIG_SYSVIPC=y

CONFIG_SYSVIPC_SYSCTL=y

# CONFIG_POSIX_MQUEUE is not set

# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_TASKSTATS is not set

# CONFIG_USER_NS is not set

# CONFIG_AUDIT is not set

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=18

# CONFIG_CGROUPS is not set

CONFIG_FAIR_GROUP_SCHED=y

CONFIG_FAIR_USER_SCHED=y

# CONFIG_FAIR_CGROUP_SCHED is not set

CONFIG_SYSFS_DEPRECATED=y

# CONFIG_RELAY is not set

# CONFIG_BLK_DEV_INITRD is not set

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_SYSCTL=y

# CONFIG_EMBEDDED is not set

CONFIG_UID16=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_EXTRA_PASS is not set

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_ANON_INODES=y

CONFIG_EPOLL=y

CONFIG_SIGNALFD=y

CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_SLUB_DEBUG=y

# CONFIG_SLAB is not set

CONFIG_SLUB=y

# CONFIG_SLOB is not set

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set

CONFIG_BASE_SMALL=0

CONFIG_MODULES=y

# CONFIG_MODULE_UNLOAD is not set

# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

# CONFIG_KMOD is not set

CONFIG_BLOCK=y

# CONFIG_LBD is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_LSF is not set

# CONFIG_BLK_DEV_BSG is not set



#

# IO Schedulers

#

CONFIG_IOSCHED_NOOP=y

CONFIG_IOSCHED_AS=y

CONFIG_IOSCHED_DEADLINE=y

CONFIG_IOSCHED_CFQ=y

# CONFIG_DEFAULT_AS is not set

# CONFIG_DEFAULT_DEADLINE is not set

CONFIG_DEFAULT_CFQ=y

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="cfq"



#

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

# CONFIG_ARCH_H720X is not set

# CONFIG_ARCH_IMX is not set

# CONFIG_ARCH_IOP13XX is not set

# CONFIG_ARCH_IOP32X is not set

# CONFIG_ARCH_IOP33X is not set

# CONFIG_ARCH_IXP23XX is not set

# CONFIG_ARCH_IXP2000 is not set

# CONFIG_ARCH_IXP4XX is not set

# CONFIG_ARCH_L7200 is not set

# CONFIG_ARCH_KS8695 is not set

# CONFIG_ARCH_NS9XXX is not set

# CONFIG_ARCH_MXC is not set

# CONFIG_ARCH_PNX4008 is not set

CONFIG_ARCH_PXA=y

# CONFIG_ARCH_RPC is not set

# CONFIG_ARCH_SA1100 is not set

# CONFIG_ARCH_S3C2410 is not set

# CONFIG_ARCH_SHARK is not set

# CONFIG_ARCH_LH7A40X is not set

# CONFIG_ARCH_DAVINCI is not set

# CONFIG_ARCH_OMAP is not set



#

# Intel PXA2xx/PXA3xx Implementations

#



#

# Supported PXA3xx Processor Variants

#

CONFIG_CPU_PXA300=y

CONFIG_CPU_PXA310=y

CONFIG_CPU_PXA320=y

# CONFIG_ARCH_LUBBOCK is not set

# CONFIG_MACH_LOGICPD_PXA270 is not set

# CONFIG_MACH_MAINSTONE is not set

# CONFIG_ARCH_PXA_IDP is not set

# CONFIG_PXA_SHARPSL is not set

# CONFIG_MACH_TRIZEPS4 is not set

# CONFIG_MACH_EM_X270 is not set

CONFIG_MACH_ZYLONITE=y

# CONFIG_MACH_ARMCORE is not set

CONFIG_PXA3xx=y



#

# Boot options

#



#

# Power management

#



#

# Processor Type

#

CONFIG_CPU_32=y

CONFIG_CPU_XSC3=y

CONFIG_CPU_32v5=y

CONFIG_CPU_ABRT_EV5T=y

CONFIG_CPU_CACHE_VIVT=y

CONFIG_CPU_TLB_V4WBI=y

CONFIG_CPU_CP15=y

CONFIG_CPU_CP15_MMU=y

CONFIG_IO_36=y



#

# Processor Features

#

# CONFIG_ARM_THUMB is not set

# CONFIG_CPU_DCACHE_DISABLE is not set

# CONFIG_CPU_BPREDICT_DISABLE is not set

# CONFIG_OUTER_CACHE is not set

CONFIG_IWMMXT=y



#

# Bus support

#

# CONFIG_PCI_SYSCALL is not set

# CONFIG_ARCH_SUPPORTS_MSI is not set

# CONFIG_PCCARD is not set



#

# Kernel Features

#

# CONFIG_TICK_ONESHOT is not set

# CONFIG_NO_HZ is not set

# CONFIG_HIGH_RES_TIMERS is not set

CONFIG_GENERIC_CLOCKEVENTS_BUILD=y

# CONFIG_PREEMPT is not set

CONFIG_HZ=100

CONFIG_AEABI=y

CONFIG_OABI_COMPAT=y

# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set

CONFIG_SELECT_MEMORY_MODEL=y

CONFIG_FLATMEM_MANUAL=y

# CONFIG_DISCONTIGMEM_MANUAL is not set

# CONFIG_SPARSEMEM_MANUAL is not set

CONFIG_FLATMEM=y

CONFIG_FLAT_NODE_MEM_MAP=y

# CONFIG_SPARSEMEM_STATIC is not set

# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set

CONFIG_SPLIT_PTLOCK_CPUS=4096

# CONFIG_RESOURCES_64BIT is not set

CONFIG_ZONE_DMA_FLAG=1

CONFIG_BOUNCE=y

CONFIG_VIRT_TO_BUS=y

CONFIG_ALIGNMENT_TRAP=y



#

# Boot options

#

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_CMDLINE="root=/dev/nfs rootfstype=nfs nfsroot=192.168.1.100:/nfs/rootfs/ ip=192.168.1.101:192.168.1.100::255.255.255.0::eth0:on console=ttyS0,38400 mem=64M debug"

# CONFIG_XIP_KERNEL is not set

# CONFIG_KEXEC is not set



#

# Floating point emulation

#



#

# At least one emulation must be selected

#

CONFIG_FPE_NWFPE=y

# CONFIG_FPE_NWFPE_XP is not set

# CONFIG_FPE_FASTFPE is not set



#

# Userspace binary formats

#

CONFIG_BINFMT_ELF=y

# CONFIG_BINFMT_AOUT is not set

# CONFIG_BINFMT_MISC is not set



#

# Power management options

#

# CONFIG_PM is not set

CONFIG_SUSPEND_UP_POSSIBLE=y



#

# Networking

#

CONFIG_NET=y



#

# Networking options

#

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

CONFIG_UNIX=y

# CONFIG_NET_KEY is not set

CONFIG_INET=y

# CONFIG_IP_MULTICAST is not set

# CONFIG_IP_ADVANCED_ROUTER is not set

CONFIG_IP_FIB_HASH=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_IP_PNP_BOOTP=y

CONFIG_IP_PNP_RARP=y

# CONFIG_NET_IPIP is not set

# CONFIG_NET_IPGRE is not set

# CONFIG_ARPD is not set

# CONFIG_SYN_COOKIES is not set

# CONFIG_INET_AH is not set

# CONFIG_INET_ESP is not set

# CONFIG_INET_IPCOMP is not set

# CONFIG_INET_XFRM_TUNNEL is not set

# CONFIG_INET_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

# CONFIG_INET_DIAG is not set

# CONFIG_TCP_CONG_ADVANCED is not set

CONFIG_TCP_CONG_CUBIC=y

CONFIG_DEFAULT_TCP_CONG="cubic"

# CONFIG_TCP_MD5SIG is not set

# 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

# CONFIG_IP_DCCP is not set

# CONFIG_IP_SCTP is not set

# CONFIG_TIPC is not set

# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set

# CONFIG_VLAN_8021Q is not set

# CONFIG_DECNET is not set

# CONFIG_LLC2 is not set

# CONFIG_IPX is not set

# CONFIG_ATALK is not set

# CONFIG_X25 is not set

# CONFIG_LAPB is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set

# CONFIG_NET_SCHED is not set



#

# Network testing

#

# CONFIG_NET_PKTGEN is not set

# CONFIG_HAMRADIO is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set



#

# Wireless

#

# CONFIG_CFG80211 is not set

# CONFIG_WIRELESS_EXT is not set

# CONFIG_MAC80211 is not set

# CONFIG_IEEE80211 is not set

# CONFIG_RFKILL is not set

# CONFIG_NET_9P is not set



#

# Device Drivers

#



#

# Generic Driver Options

#

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

CONFIG_FW_LOADER=y

# CONFIG_SYS_HYPERVISOR is not set

# CONFIG_CONNECTOR is not set

# CONFIG_MTD is not set

# CONFIG_PARPORT is not set

# CONFIG_BLK_DEV is not set

# CONFIG_MISC_DEVICES is not set

# CONFIG_IDE is not set



#

# SCSI device support

#

# CONFIG_RAID_ATTRS is not set

# CONFIG_SCSI is not set

# CONFIG_SCSI_DMA is not set

# CONFIG_SCSI_NETLINK is not set

# CONFIG_ATA is not set

# CONFIG_MD is not set

CONFIG_NETDEVICES=y

# CONFIG_NETDEVICES_MULTIQUEUE is not set

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

# CONFIG_MACVLAN is not set

# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set

# CONFIG_VETH is not set

# CONFIG_PHYLIB is not set

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

# CONFIG_AX88796 is not set

CONFIG_SMC91X=y

# CONFIG_DM9000 is not set

# CONFIG_SMC911X is not set

# CONFIG_IBM_NEW_EMAC_ZMII is not set

# CONFIG_IBM_NEW_EMAC_RGMII is not set

# CONFIG_IBM_NEW_EMAC_TAH is not set

# CONFIG_IBM_NEW_EMAC_EMAC4 is not set

# CONFIG_B44 is not set

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set



#

# Wireless LAN

#

# CONFIG_WLAN_PRE80211 is not set

# CONFIG_WLAN_80211 is not set

# CONFIG_WAN is not set

# CONFIG_PPP is not set

# CONFIG_SLIP is not set

# CONFIG_SHAPER is not set

# CONFIG_NETCONSOLE is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set

# CONFIG_ISDN is not set



#

# Input device support

#

CONFIG_INPUT=y

# CONFIG_INPUT_FF_MEMLESS is not set

# CONFIG_INPUT_POLLDEV is not set



#

# Userland interfaces

#

CONFIG_INPUT_MOUSEDEV=y

# CONFIG_INPUT_MOUSEDEV_PSAUX is not set

CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024

CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768

# CONFIG_INPUT_JOYDEV is not set

# CONFIG_INPUT_EVDEV is not set

# CONFIG_INPUT_EVBUG is not set



#

# Input Device Drivers

#

# CONFIG_INPUT_KEYBOARD is not set

# CONFIG_INPUT_MOUSE is not set

# CONFIG_INPUT_JOYSTICK is not set

# CONFIG_INPUT_TABLET is not set

# CONFIG_INPUT_TOUCHSCREEN is not set

# CONFIG_INPUT_MISC is not set



#

# Hardware I/O ports

#

# CONFIG_SERIO is not set

# CONFIG_GAMEPORT is not set



#

# Character devices

#

CONFIG_VT=y

CONFIG_VT_CONSOLE=y

CONFIG_HW_CONSOLE=y

# CONFIG_VT_HW_CONSOLE_BINDING is not set

# CONFIG_SERIAL_NONSTANDARD is not set



#

# Serial drivers

#

# CONFIG_SERIAL_8250 is not set



#

# Non-8250 serial port support

#

CONFIG_SERIAL_PXA=y

CONFIG_SERIAL_PXA_CONSOLE=y

CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y

CONFIG_UNIX98_PTYS=y

# CONFIG_LEGACY_PTYS is not set

# CONFIG_IPMI_HANDLER is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_NVRAM is not set

# CONFIG_R3964 is not set

# CONFIG_RAW_DRIVER is not set

# CONFIG_TCG_TPM is not set

# CONFIG_I2C is not set



#

# SPI support

#

# CONFIG_SPI is not set

# CONFIG_SPI_MASTER is not set

# CONFIG_W1 is not set

# CONFIG_POWER_SUPPLY is not set

# CONFIG_HWMON is not set



#

# Sonics Silicon Backplane

#

CONFIG_SSB_POSSIBLE=y

# CONFIG_SSB is not set



#

# Multifunction device drivers

#

# CONFIG_MFD_SM501 is not set



#

# Multimedia devices

#

# CONFIG_VIDEO_DEV is not set

# CONFIG_DVB_CORE is not set

# CONFIG_DAB is not set



#

# Graphics support

#

# CONFIG_VGASTATE is not set

# CONFIG_VIDEO_OUTPUT_CONTROL is not set

CONFIG_FB=y

# CONFIG_FIRMWARE_EDID is not set

# CONFIG_FB_DDC is not set

CONFIG_FB_CFB_FILLRECT=y

CONFIG_FB_CFB_COPYAREA=y

CONFIG_FB_CFB_IMAGEBLIT=y

# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set

# CONFIG_FB_SYS_FILLRECT is not set

# CONFIG_FB_SYS_COPYAREA is not set

# CONFIG_FB_SYS_IMAGEBLIT is not set

# CONFIG_FB_SYS_FOPS is not set

CONFIG_FB_DEFERRED_IO=y

# CONFIG_FB_SVGALIB is not set

# CONFIG_FB_MACMODES is not set

# CONFIG_FB_BACKLIGHT is not set

# CONFIG_FB_MODE_HELPERS is not set

# CONFIG_FB_TILEBLITTING is not set



#

# Frame buffer hardware drivers

#

# CONFIG_FB_S1D13XXX is not set

CONFIG_FB_PXA=y

# CONFIG_FB_PXA_PARAMETERS is not set

# CONFIG_FB_MBX is not set

# CONFIG_FB_VIRTUAL is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Display device support

#

# CONFIG_DISPLAY_SUPPORT is not set



#

# Console display driver support

#

# CONFIG_VGA_CONSOLE is not set

CONFIG_DUMMY_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y

# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set

CONFIG_FONTS=y

# CONFIG_FONT_8x8 is not set

# CONFIG_FONT_8x16 is not set

CONFIG_FONT_6x11=y

# CONFIG_FONT_7x14 is not set

# CONFIG_FONT_PEARL_8x8 is not set

# CONFIG_FONT_ACORN_8x8 is not set

# CONFIG_FONT_MINI_4x6 is not set

# CONFIG_FONT_SUN8x16 is not set

# CONFIG_FONT_SUN12x22 is not set

# CONFIG_FONT_10x18 is not set

CONFIG_LOGO=y

CONFIG_LOGO_LINUX_MONO=y

CONFIG_LOGO_LINUX_VGA16=y

CONFIG_LOGO_LINUX_CLUT224=y



#

# Sound

#

# CONFIG_SOUND is not set

# CONFIG_HID_SUPPORT is not set

# CONFIG_USB_SUPPORT is not set

# CONFIG_MMC is not set

# CONFIG_NEW_LEDS is not set

CONFIG_RTC_LIB=y

# CONFIG_RTC_CLASS is not set



#

# File systems

#

# CONFIG_EXT2_FS is not set

# CONFIG_EXT3_FS is not set

# CONFIG_EXT4DEV_FS is not set

# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set

CONFIG_FS_POSIX_ACL=y

# CONFIG_XFS_FS is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_ROMFS_FS is not set

# CONFIG_INOTIFY is not set

# CONFIG_QUOTA is not set

CONFIG_DNOTIFY=y

# CONFIG_AUTOFS_FS is not set

# CONFIG_AUTOFS4_FS is not set

# CONFIG_FUSE_FS is not set



#

# CD-ROM/DVD Filesystems

#

# CONFIG_ISO9660_FS is not set

# CONFIG_UDF_FS is not set



#

# DOS/FAT/NT Filesystems

#

# CONFIG_MSDOS_FS is not set

# CONFIG_VFAT_FS is not set

# CONFIG_NTFS_FS is not set



#

# Pseudo filesystems

#

CONFIG_PROC_FS=y

CONFIG_PROC_SYSCTL=y

CONFIG_SYSFS=y

# CONFIG_TMPFS is not set

# CONFIG_HUGETLB_PAGE is not set

# CONFIG_CONFIGFS_FS is not set



#

# Miscellaneous filesystems

#

# CONFIG_ADFS_FS is not set

# CONFIG_AFFS_FS is not set

# CONFIG_HFS_FS is not set

# CONFIG_HFSPLUS_FS is not set

# CONFIG_BEFS_FS is not set

# CONFIG_BFS_FS is not set

# CONFIG_EFS_FS is not set

# CONFIG_CRAMFS is not set

# CONFIG_VXFS_FS is not set

# CONFIG_HPFS_FS is not set

# CONFIG_QNX4FS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y

CONFIG_NFS_V3_ACL=y

CONFIG_NFS_V4=y

CONFIG_NFS_DIRECTIO=y

# CONFIG_NFSD is not set

CONFIG_ROOT_NFS=y

CONFIG_LOCKD=y

CONFIG_LOCKD_V4=y

CONFIG_NFS_ACL_SUPPORT=y

CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=y

CONFIG_SUNRPC_GSS=y

# CONFIG_SUNRPC_BIND34 is not set

CONFIG_RPCSEC_GSS_KRB5=y

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set

# CONFIG_CIFS is not set

# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set

# CONFIG_AFS_FS is not set



#

# Partition Types

#

# CONFIG_PARTITION_ADVANCED is not set

CONFIG_MSDOS_PARTITION=y

# CONFIG_NLS is not set

# CONFIG_DLM is not set

# CONFIG_INSTRUMENTATION is not set



#

# Kernel hacking

#

# CONFIG_PRINTK_TIME is not set

CONFIG_ENABLE_MUST_CHECK=y

# CONFIG_MAGIC_SYSRQ is not set

# CONFIG_UNUSED_SYMBOLS is not set

# CONFIG_DEBUG_FS is not set

# CONFIG_HEADERS_CHECK is not set

# CONFIG_DEBUG_KERNEL is not set

# CONFIG_SLUB_DEBUG_ON is not set

CONFIG_DEBUG_BUGVERBOSE=y

CONFIG_FRAME_POINTER=y

# CONFIG_SAMPLES is not set

CONFIG_DEBUG_USER=y



#

# Security options

#

# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

CONFIG_CRYPTO=y

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_BLKCIPHER=y

CONFIG_CRYPTO_MANAGER=y

# CONFIG_CRYPTO_HMAC is not set

# CONFIG_CRYPTO_XCBC is not set

# CONFIG_CRYPTO_NULL is not set

# CONFIG_CRYPTO_MD4 is not set

CONFIG_CRYPTO_MD5=y

# CONFIG_CRYPTO_SHA1 is not set

# CONFIG_CRYPTO_SHA256 is not set

# CONFIG_CRYPTO_SHA512 is not set

# CONFIG_CRYPTO_WP512 is not set

# CONFIG_CRYPTO_TGR192 is not set

# CONFIG_CRYPTO_GF128MUL is not set

# CONFIG_CRYPTO_ECB is not set

CONFIG_CRYPTO_CBC=y

# CONFIG_CRYPTO_PCBC is not set

# CONFIG_CRYPTO_LRW is not set

# CONFIG_CRYPTO_XTS is not set

# CONFIG_CRYPTO_CRYPTD is not set

CONFIG_CRYPTO_DES=y

# CONFIG_CRYPTO_FCRYPT is not set

# CONFIG_CRYPTO_BLOWFISH is not set

# CONFIG_CRYPTO_TWOFISH is not set

# CONFIG_CRYPTO_SERPENT is not set

# CONFIG_CRYPTO_AES is not set

# CONFIG_CRYPTO_CAST5 is not set

# CONFIG_CRYPTO_CAST6 is not set

# CONFIG_CRYPTO_TEA is not set

# CONFIG_CRYPTO_ARC4 is not set

# CONFIG_CRYPTO_KHAZAD is not set

# CONFIG_CRYPTO_ANUBIS is not set

# CONFIG_CRYPTO_SEED is not set

# CONFIG_CRYPTO_DEFLATE is not set

# CONFIG_CRYPTO_MICHAEL_MIC is not set

# CONFIG_CRYPTO_CRC32C is not set

# CONFIG_CRYPTO_CAMELLIA is not set

# CONFIG_CRYPTO_TEST is not set

# CONFIG_CRYPTO_AUTHENC is not set

# CONFIG_CRYPTO_HW is not set



#

# Library routines

#

CONFIG_BITREVERSE=y

# CONFIG_CRC_CCITT is not set

# CONFIG_CRC16 is not set

# CONFIG_CRC_ITU_T is not set

CONFIG_CRC32=y

# CONFIG_CRC7 is not set

# CONFIG_LIBCRC32C is not set

CONFIG_PLIST=y

CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

arch/arm/mach-netx/xc.c

+3 −3
Original line number Diff line number Diff line
@@ -190,15 +190,15 @@ struct xc *request_xc(int xcno, struct device *dev) 
		goto exit;



	if (!request_mem_region

	    (NETX_PA_XPEC(xcno), XPEC_MEM_SIZE, dev->kobj.name))

	    (NETX_PA_XPEC(xcno), XPEC_MEM_SIZE, kobject_name(dev->kobj)))

		goto exit_free;



	if (!request_mem_region

	    (NETX_PA_XMAC(xcno), XMAC_MEM_SIZE, dev->kobj.name))

	    (NETX_PA_XMAC(xcno), XMAC_MEM_SIZE, kobject_name(dev->kobj)))

		goto exit_release_1;



	if (!request_mem_region

	    (SRAM_INTERNAL_PHYS(xcno), SRAM_MEM_SIZE, dev->kobj.name))

	    (SRAM_INTERNAL_PHYS(xcno), SRAM_MEM_SIZE, kobject_name(dev->kobj)))

		goto exit_release_2;



	x->xpec_base = (void * __iomem)io_p2v(NETX_PA_XPEC(xcno));

arch/arm/mach-omap1/board-h2.c

+4 −0
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ static struct platform_device *h2_devices[] __initdata = { 
	&h2_mcbsp1_device,

};



#ifdef CONFIG_I2C_BOARDINFO

static struct i2c_board_info __initdata h2_i2c_board_info[] = {

	{

		I2C_BOARD_INFO("tps65010", 0x48),
@@ -356,6 +357,7 @@ static struct i2c_board_info __initdata h2_i2c_board_info[] = { 
	 *  - ... etc

	 */

};

#endif



static void __init h2_init_smc91x(void)

{
@@ -467,8 +469,10 @@ static void __init h2_init(void) 
	if (gpio_request(58, "tps65010") == 0)

		gpio_direction_input(58);



#ifdef CONFIG_I2C_BOARDINFO

	i2c_register_board_info(1, h2_i2c_board_info,

			ARRAY_SIZE(h2_i2c_board_info));

#endif

}



static void __init h2_map_io(void)

arch/arm/mach-omap2/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -651,7 +651,7 @@ static u32 omap2_get_clksel(u32 *div_sel, u32 *field_mask, 
		break;

	case CM_SYSCLKOUT_SEL1:

		div_addr = (u32)&PRCM_CLKOUT_CTRL;

		if ((div_off == 3) || (div_off = 11))

		if ((div_off == 3) || (div_off == 11))

			mask= 0x3;

		break;

	case CM_CORE_SEL1:

arch/arm/mach-pxa/mfp.c

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 *

 * Copyright (C) 2007 Marvell Internation Ltd.

 *

 * 2007-08-21: eric miao <eric.y.miao@gmail.com>

 * 2007-08-21: eric miao <eric.miao@marvell.com>

 *             initial version

 *

 *  This program is free software; you can redistribute it and/or modify

CRA Git | Maintained and supported by SUSTech CRA and CCSE