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

Commit 7e2cec86 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  sparc64: Update defconfig.
  Revert "sparc: correct section of current_pc()"
parents 0a4cf2c8 12de512a

arch/sparc/kernel/head.S

+0 −1
Original line number Diff line number Diff line
@@ -465,7 +465,6 @@ gokernel: 
		mov	%o7, %g4		! Save %o7



		/* Jump to it, and pray... */

		__INIT

current_pc:

		call	1f

		 nop

arch/sparc64/defconfig

+195 −37
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.26

# Fri Jul 18 00:47:07 2008

# Linux kernel version: 2.6.28-rc4

# Mon Nov 10 12:35:09 2008

#

CONFIG_SPARC=y

CONFIG_SPARC64=y
@@ -62,7 +62,6 @@ CONFIG_SYSCTL=y 
# CONFIG_EMBEDDED is not set

CONFIG_UID16=y

CONFIG_SYSCTL_SYSCALL=y

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set
@@ -79,7 +78,9 @@ CONFIG_SIGNALFD=y 
CONFIG_TIMERFD=y

CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_AIO=y

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_PCI_QUIRKS=y

CONFIG_SLUB_DEBUG=y

# CONFIG_SLAB is not set

CONFIG_SLUB=y
@@ -92,9 +93,9 @@ CONFIG_KPROBES=y 
CONFIG_KRETPROBES=y

CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

# CONFIG_HAVE_DMA_ATTRS is not set

CONFIG_HAVE_ARCH_TRACEHOOK=y

CONFIG_USE_GENERIC_SMP_HELPERS=y

CONFIG_PROC_PAGE_MONITOR=y

# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y

# CONFIG_TINY_SHMEM is not set
@@ -126,6 +127,7 @@ CONFIG_DEFAULT_AS=y 
# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="anticipatory"

CONFIG_CLASSIC_RCU=y

# CONFIG_FREEZER is not set



#

# Processor type and features
@@ -138,7 +140,7 @@ CONFIG_HZ_100=y 
# CONFIG_HZ_300 is not set

# CONFIG_HZ_1000 is not set

CONFIG_HZ=100

# CONFIG_SCHED_HRTICK is not set

CONFIG_SCHED_HRTICK=y

CONFIG_HOTPLUG_CPU=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_TICK_ONESHOT=y
@@ -148,6 +150,7 @@ CONFIG_GENERIC_CLOCKEVENTS_BUILD=y 
CONFIG_SMP=y

CONFIG_NR_CPUS=64

# CONFIG_CPU_FREQ is not set

CONFIG_US3_MC=y

CONFIG_RWSEM_XCHGADD_ALGORITHM=y

CONFIG_GENERIC_FIND_NEXT_BIT=y

CONFIG_GENERIC_HWEIGHT=y
@@ -169,7 +172,6 @@ CONFIG_SPARSEMEM_MANUAL=y 
CONFIG_SPARSEMEM=y

CONFIG_NEED_MULTIPLE_NODES=y

CONFIG_HAVE_MEMORY_PRESENT=y

# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPARSEMEM_EXTREME=y

CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y

CONFIG_SPARSEMEM_VMEMMAP=y
@@ -177,8 +179,10 @@ CONFIG_PAGEFLAGS_EXTENDED=y 
CONFIG_SPLIT_PTLOCK_CPUS=4

CONFIG_MIGRATION=y

CONFIG_RESOURCES_64BIT=y

CONFIG_PHYS_ADDR_T_64BIT=y

CONFIG_ZONE_DMA_FLAG=0

CONFIG_NR_QUICK=1

CONFIG_UNEVICTABLE_LRU=y

CONFIG_SBUS=y

CONFIG_SBUSCHAR=y

CONFIG_SUN_AUXIO=y
@@ -198,6 +202,8 @@ CONFIG_SUN_OPENPROMFS=m 
#

CONFIG_BINFMT_ELF=y

CONFIG_COMPAT_BINFMT_ELF=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_HAVE_AOUT is not set

CONFIG_BINFMT_MISC=m

CONFIG_COMPAT=y

CONFIG_SYSVIPC_COMPAT=y
@@ -207,10 +213,6 @@ CONFIG_SCHED_MC=y 
CONFIG_PREEMPT_VOLUNTARY=y

# CONFIG_PREEMPT is not set

# CONFIG_CMDLINE_BOOL is not set



#

# Networking

#

CONFIG_NET=y



#
@@ -224,6 +226,7 @@ CONFIG_XFRM_USER=m 
# CONFIG_XFRM_SUB_POLICY is not set

CONFIG_XFRM_MIGRATE=y

# CONFIG_XFRM_STATISTICS is not set

CONFIG_XFRM_IPCOMP=y

CONFIG_NET_KEY=m

CONFIG_NET_KEY_MIGRATE=y

CONFIG_INET=y
@@ -299,7 +302,9 @@ CONFIG_IP_DCCP_TFRC_LIB=m 
# CONFIG_TIPC is not set

# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set

# CONFIG_NET_DSA is not set

CONFIG_VLAN_8021Q=m

# CONFIG_VLAN_8021Q_GVRP is not set

# CONFIG_DECNET is not set

# CONFIG_LLC2 is not set

# CONFIG_IPX is not set
@@ -320,11 +325,10 @@ CONFIG_NET_TCPPROBE=m 
# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set



#

# Wireless

#

# CONFIG_PHONET is not set

CONFIG_WIRELESS=y

# CONFIG_CFG80211 is not set

CONFIG_WIRELESS_OLD_REGULATORY=y

# CONFIG_WIRELESS_EXT is not set

# CONFIG_MAC80211 is not set

# CONFIG_IEEE80211 is not set
@@ -375,21 +379,21 @@ CONFIG_MISC_DEVICES=y 
# CONFIG_SGI_IOC4 is not set

# CONFIG_TIFM_CORE is not set

# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_HP_ILO is not set

CONFIG_HAVE_IDE=y

CONFIG_IDE=y

CONFIG_BLK_DEV_IDE=y



#

# Please see Documentation/ide/ide.txt for help/info on IDE drives

#

CONFIG_IDE_TIMINGS=y

# CONFIG_BLK_DEV_IDE_SATA is not set

CONFIG_BLK_DEV_IDEDISK=y

# CONFIG_IDEDISK_MULTI_MODE is not set

CONFIG_IDE_GD=y

CONFIG_IDE_GD_ATA=y

# CONFIG_IDE_GD_ATAPI is not set

CONFIG_BLK_DEV_IDECD=y

CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y

# CONFIG_BLK_DEV_IDETAPE is not set

# CONFIG_BLK_DEV_IDEFLOPPY is not set

# CONFIG_BLK_DEV_IDESCSI is not set

# CONFIG_IDE_TASK_IOCTL is not set

CONFIG_IDE_PROC_FS=y
@@ -413,10 +417,8 @@ CONFIG_BLK_DEV_ALI15X3=y 
# CONFIG_BLK_DEV_AMD74XX is not set

# CONFIG_BLK_DEV_CMD64X is not set

# CONFIG_BLK_DEV_TRIFLEX is not set

# CONFIG_BLK_DEV_CY82C693 is not set

# CONFIG_BLK_DEV_CS5520 is not set

# CONFIG_BLK_DEV_CS5530 is not set

# CONFIG_BLK_DEV_HPT34X is not set

# CONFIG_BLK_DEV_HPT366 is not set

# CONFIG_BLK_DEV_JMICRON is not set

# CONFIG_BLK_DEV_SC1200 is not set
@@ -540,7 +542,6 @@ CONFIG_DM_ZERO=m 
# CONFIG_IEEE1394 is not set

# CONFIG_I2O 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
@@ -548,7 +549,22 @@ CONFIG_NETDEVICES=y 
# CONFIG_TUN is not set

# CONFIG_VETH is not set

# CONFIG_ARCNET is not set

# CONFIG_PHYLIB is not set

CONFIG_PHYLIB=m



#

# MII PHY device drivers

#

# CONFIG_MARVELL_PHY is not set

# CONFIG_DAVICOM_PHY is not set

# CONFIG_QSEMI_PHY is not set

# CONFIG_LXT_PHY is not set

# CONFIG_CICADA_PHY is not set

# CONFIG_VITESSE_PHY is not set

# CONFIG_SMSC_PHY is not set

# CONFIG_BROADCOM_PHY is not set

# CONFIG_ICPLUS_PHY is not set

# CONFIG_REALTEK_PHY is not set

# CONFIG_MDIO_BITBANG is not set

CONFIG_NET_ETHERNET=y

CONFIG_MII=m

# CONFIG_SUNLANCE is not set
@@ -565,6 +581,9 @@ CONFIG_SUNVNET=m 
# 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_IBM_NEW_EMAC_NO_FLOW_CTRL is not set

# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set

# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set

CONFIG_NET_PCI=y

# CONFIG_PCNET32 is not set

# CONFIG_AMD8111_ETH is not set
@@ -582,16 +601,15 @@ CONFIG_NET_PCI=y 
# CONFIG_SIS900 is not set

# CONFIG_EPIC100 is not set

# CONFIG_SUNDANCE is not set

# CONFIG_TLAN is not set

# CONFIG_VIA_RHINE is not set

# CONFIG_SC92031 is not set

# CONFIG_ATL2 is not set

CONFIG_NETDEV_1000=y

# CONFIG_ACENIC is not set

# CONFIG_DL2K is not set

CONFIG_E1000=m

CONFIG_E1000_NAPI=y

# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set

# CONFIG_E1000E is not set

# CONFIG_E1000E_ENABLED is not set

# CONFIG_IP1000 is not set

# CONFIG_IGB is not set

# CONFIG_MYRI_SBUS is not set
@@ -607,18 +625,23 @@ CONFIG_TIGON3=m 
CONFIG_BNX2=m

# CONFIG_QLA3XXX is not set

# CONFIG_ATL1 is not set

# CONFIG_ATL1E is not set

# CONFIG_JME is not set

CONFIG_NETDEV_10000=y

# CONFIG_CHELSIO_T1 is not set

# CONFIG_CHELSIO_T3 is not set

# CONFIG_ENIC is not set

# CONFIG_IXGBE is not set

# CONFIG_IXGB is not set

# CONFIG_S2IO is not set

# CONFIG_MYRI10GE is not set

# CONFIG_NETXEN_NIC is not set

CONFIG_NIU=m

# CONFIG_MLX4_EN is not set

# CONFIG_MLX4_CORE is not set

# CONFIG_TEHUTI is not set

# CONFIG_BNX2X is not set

# CONFIG_QLGE is not set

# CONFIG_SFC is not set

# CONFIG_TR is not set
@@ -694,9 +717,11 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y 
CONFIG_MOUSE_PS2_SYNAPTICS=y

CONFIG_MOUSE_PS2_LIFEBOOK=y

CONFIG_MOUSE_PS2_TRACKPOINT=y

# CONFIG_MOUSE_PS2_ELANTECH is not set

# CONFIG_MOUSE_PS2_TOUCHKIT is not set

CONFIG_MOUSE_SERIAL=y

# CONFIG_MOUSE_APPLETOUCH is not set

# CONFIG_MOUSE_BCM5974 is not set

# CONFIG_MOUSE_VSXXXAA is not set

# CONFIG_INPUT_JOYSTICK is not set

# CONFIG_INPUT_TABLET is not set
@@ -708,6 +733,7 @@ CONFIG_INPUT_SPARCSPKR=y 
# CONFIG_INPUT_KEYSPAN_REMOTE is not set

# CONFIG_INPUT_POWERMATE is not set

# CONFIG_INPUT_YEALINK is not set

# CONFIG_INPUT_CM109 is not set

# CONFIG_INPUT_UINPUT is not set



#
@@ -725,6 +751,7 @@ CONFIG_SERIO_RAW=m 
# Character devices

#

CONFIG_VT=y

CONFIG_CONSOLE_TRANSLATIONS=y

CONFIG_VT_CONSOLE=y

CONFIG_HW_CONSOLE=y

# CONFIG_VT_HW_CONSOLE_BINDING is not set
@@ -735,6 +762,7 @@ CONFIG_HW_CONSOLE=y 
#

# Serial drivers

#

# CONFIG_SERIAL_8250 is not set



#

# Non-8250 serial port support
@@ -762,6 +790,7 @@ CONFIG_DEVPORT=y 
CONFIG_I2C=y

CONFIG_I2C_BOARDINFO=y

# CONFIG_I2C_CHARDEV is not set

CONFIG_I2C_HELPER_AUTO=y

CONFIG_I2C_ALGOBIT=y



#
@@ -827,10 +856,13 @@ CONFIG_I2C_ALGOBIT=y 
# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_CHIP is not set

# CONFIG_SPI is not set

CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y

# CONFIG_GPIOLIB is not set

# CONFIG_W1 is not set

# CONFIG_POWER_SUPPLY is not set

CONFIG_HWMON=y

# CONFIG_HWMON_VID is not set

# CONFIG_SENSORS_AD7414 is not set

# CONFIG_SENSORS_AD7418 is not set

# CONFIG_SENSORS_ADM1021 is not set

# CONFIG_SENSORS_ADM1025 is not set
@@ -882,6 +914,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_W83L786NG is not set

# CONFIG_SENSORS_W83627HF is not set

# CONFIG_SENSORS_W83627EHF is not set

# CONFIG_SENSORS_ULTRA45 is not set

# CONFIG_HWMON_DEBUG_CHIP is not set

# CONFIG_THERMAL is not set

# CONFIG_THERMAL_HWMON is not set
@@ -896,8 +929,14 @@ CONFIG_SSB_POSSIBLE=y 
#

# Multifunction device drivers

#

# CONFIG_MFD_CORE is not set

# CONFIG_MFD_SM501 is not set

# CONFIG_HTC_PASIC3 is not set

# CONFIG_MFD_TMIO is not set

# CONFIG_PMIC_DA903X is not set

# CONFIG_MFD_WM8400 is not set

# CONFIG_MFD_WM8350_I2C is not set

# CONFIG_REGULATOR is not set



#

# Multimedia devices
@@ -924,6 +963,7 @@ CONFIG_SSB_POSSIBLE=y 
CONFIG_FB=y

# CONFIG_FIRMWARE_EDID is not set

CONFIG_FB_DDC=y

# CONFIG_FB_BOOT_VESA_SUPPORT is not set

CONFIG_FB_CFB_FILLRECT=y

CONFIG_FB_CFB_COPYAREA=y

CONFIG_FB_CFB_IMAGEBLIT=y
@@ -975,6 +1015,7 @@ CONFIG_FB_ATY_GX=y 
# CONFIG_FB_S3 is not set

# CONFIG_FB_SAVAGE is not set

# CONFIG_FB_SIS is not set

# CONFIG_FB_VIA is not set

# CONFIG_FB_NEOMAGIC is not set

# CONFIG_FB_KYRO is not set

# CONFIG_FB_3DFX is not set
@@ -983,7 +1024,10 @@ CONFIG_FB_ATY_GX=y 
# CONFIG_FB_TRIDENT is not set

# CONFIG_FB_ARK is not set

# CONFIG_FB_PM3 is not set

# CONFIG_FB_CARMINE is not set

# CONFIG_FB_VIRTUAL is not set

# CONFIG_FB_METRONOME is not set

# CONFIG_FB_MB862XX is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#
@@ -1015,6 +1059,7 @@ CONFIG_LOGO=y 
# CONFIG_LOGO_LINUX_CLUT224 is not set

CONFIG_LOGO_SUN_CLUT224=y

CONFIG_SOUND=m

CONFIG_SOUND_OSS_CORE=y

CONFIG_SND=m

CONFIG_SND_TIMER=m

CONFIG_SND_PCM=m
@@ -1120,9 +1165,36 @@ CONFIG_HID=y 
# USB Input Devices

#

CONFIG_USB_HID=y

# CONFIG_USB_HIDINPUT_POWERBOOK is not set

# CONFIG_HID_FF is not set

# CONFIG_HID_PID is not set

CONFIG_USB_HIDDEV=y



#

# Special HID drivers

#

CONFIG_HID_COMPAT=y

CONFIG_HID_A4TECH=y

CONFIG_HID_APPLE=y

CONFIG_HID_BELKIN=y

CONFIG_HID_BRIGHT=y

CONFIG_HID_CHERRY=y

CONFIG_HID_CHICONY=y

CONFIG_HID_CYPRESS=y

CONFIG_HID_DELL=y

CONFIG_HID_EZKEY=y

CONFIG_HID_GYRATION=y

CONFIG_HID_LOGITECH=y

# CONFIG_LOGITECH_FF is not set

# CONFIG_LOGIRUMBLEPAD2_FF is not set

CONFIG_HID_MICROSOFT=y

CONFIG_HID_MONTEREY=y

CONFIG_HID_PANTHERLORD=y

# CONFIG_PANTHERLORD_FF is not set

CONFIG_HID_PETALYNX=y

CONFIG_HID_SAMSUNG=y

CONFIG_HID_SONY=y

CONFIG_HID_SUNPLUS=y

# CONFIG_THRUSTMASTER_FF is not set

# CONFIG_ZEROPLUS_FF is not set

CONFIG_USB_SUPPORT=y

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1138,6 +1210,9 @@ CONFIG_USB_DEVICEFS=y 
# CONFIG_USB_DEVICE_CLASS is not set

# CONFIG_USB_DYNAMIC_MINORS is not set

# CONFIG_USB_OTG is not set

# CONFIG_USB_MON is not set

# CONFIG_USB_WUSB is not set

# CONFIG_USB_WUSB_CBAF is not set



#

# USB Host Controller Drivers
@@ -1155,6 +1230,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y 
CONFIG_USB_UHCI_HCD=m

# CONFIG_USB_SL811_HCD is not set

# CONFIG_USB_R8A66597_HCD is not set

# CONFIG_USB_WHCI_HCD is not set

# CONFIG_USB_HWA_HCD is not set



#

# USB Device Class drivers
@@ -1162,6 +1239,7 @@ CONFIG_USB_UHCI_HCD=m 
# CONFIG_USB_ACM is not set

# CONFIG_USB_PRINTER is not set

# CONFIG_USB_WDM is not set

# CONFIG_USB_TMC is not set



#

# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
@@ -1191,7 +1269,6 @@ CONFIG_USB_STORAGE=m 
#

# CONFIG_USB_MDC800 is not set

# CONFIG_USB_MICROTEK is not set

# CONFIG_USB_MON is not set



#

# USB port drivers
@@ -1204,7 +1281,7 @@ CONFIG_USB_STORAGE=m 
# CONFIG_USB_EMI62 is not set

# CONFIG_USB_EMI26 is not set

# CONFIG_USB_ADUTUX is not set

# CONFIG_USB_AUERSWALD is not set

# CONFIG_USB_SEVSEG is not set

# CONFIG_USB_RIO500 is not set

# CONFIG_USB_LEGOTOWER is not set

# CONFIG_USB_LCD is not set
@@ -1222,21 +1299,80 @@ CONFIG_USB_STORAGE=m 
# CONFIG_USB_IOWARRIOR is not set

# CONFIG_USB_TEST is not set

# CONFIG_USB_ISIGHTFW is not set

# CONFIG_USB_VST is not set

# CONFIG_USB_GADGET is not set

# CONFIG_UWB is not set

# CONFIG_MMC is not set

# CONFIG_MEMSTICK is not set

# CONFIG_NEW_LEDS is not set

# CONFIG_ACCESSIBILITY is not set

# CONFIG_INFINIBAND is not set

# CONFIG_RTC_CLASS is not set

CONFIG_RTC_LIB=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_HCTOSYS=y

CONFIG_RTC_HCTOSYS_DEVICE="rtc0"

# CONFIG_RTC_DEBUG is not set



#

# RTC interfaces

#

CONFIG_RTC_INTF_SYSFS=y

CONFIG_RTC_INTF_PROC=y

CONFIG_RTC_INTF_DEV=y

# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set

# CONFIG_RTC_DRV_TEST is not set



#

# I2C RTC drivers

#

# CONFIG_RTC_DRV_DS1307 is not set

# CONFIG_RTC_DRV_DS1374 is not set

# CONFIG_RTC_DRV_DS1672 is not set

# CONFIG_RTC_DRV_MAX6900 is not set

# CONFIG_RTC_DRV_RS5C372 is not set

# CONFIG_RTC_DRV_ISL1208 is not set

# CONFIG_RTC_DRV_X1205 is not set

# CONFIG_RTC_DRV_PCF8563 is not set

# CONFIG_RTC_DRV_PCF8583 is not set

# CONFIG_RTC_DRV_M41T80 is not set

# CONFIG_RTC_DRV_S35390A is not set

# CONFIG_RTC_DRV_FM3130 is not set



#

# SPI RTC drivers

#



#

# Platform RTC drivers

#

CONFIG_RTC_DRV_CMOS=y

# CONFIG_RTC_DRV_DS1286 is not set

# CONFIG_RTC_DRV_DS1511 is not set

# CONFIG_RTC_DRV_DS1553 is not set

# CONFIG_RTC_DRV_DS1742 is not set

# CONFIG_RTC_DRV_STK17TA8 is not set

# CONFIG_RTC_DRV_M48T86 is not set

# CONFIG_RTC_DRV_M48T35 is not set

CONFIG_RTC_DRV_M48T59=y

CONFIG_RTC_DRV_BQ4802=y

# CONFIG_RTC_DRV_V3020 is not set



#

# on-CPU RTC drivers

#

CONFIG_RTC_DRV_SUN4V=y

CONFIG_RTC_DRV_STARFIRE=y

# CONFIG_DMADEVICES is not set

# CONFIG_UIO is not set

# CONFIG_STAGING is not set

CONFIG_STAGING_EXCLUDE_BUILD=y



#

# Misc Linux/SPARC drivers

#

CONFIG_SUN_OPENPROMIO=y

# CONFIG_OBP_FLASH is not set

# CONFIG_SUN_BPP is not set

# CONFIG_TADPOLE_TS102_UCTRL is not set

# CONFIG_BBC_I2C is not set

# CONFIG_ENVCTRL is not set

# CONFIG_DISPLAY7SEG is not set
@@ -1253,13 +1389,14 @@ CONFIG_EXT3_FS=y 
CONFIG_EXT3_FS_XATTR=y

CONFIG_EXT3_FS_POSIX_ACL=y

CONFIG_EXT3_FS_SECURITY=y

# CONFIG_EXT4DEV_FS is not set

# CONFIG_EXT4_FS is not set

CONFIG_JBD=y

# CONFIG_JBD_DEBUG is not set

CONFIG_FS_MBCACHE=y

# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set

CONFIG_FS_POSIX_ACL=y

CONFIG_FILE_LOCKING=y

# CONFIG_XFS_FS is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set
@@ -1290,6 +1427,7 @@ CONFIG_INOTIFY_USER=y 
CONFIG_PROC_FS=y

CONFIG_PROC_KCORE=y

CONFIG_PROC_SYSCTL=y

CONFIG_PROC_PAGE_MONITOR=y

CONFIG_SYSFS=y

CONFIG_TMPFS=y

# CONFIG_TMPFS_POSIX_ACL is not set
@@ -1311,6 +1449,7 @@ CONFIG_HUGETLB_PAGE=y 
# CONFIG_CRAMFS is not set

# CONFIG_VXFS_FS is not set

# CONFIG_MINIX_FS is not set

# CONFIG_OMFS_FS is not set

# CONFIG_HPFS_FS is not set

# CONFIG_QNX4FS_FS is not set

# CONFIG_ROMFS_FS is not set
@@ -1388,6 +1527,8 @@ CONFIG_DEBUG_FS=y 
CONFIG_DEBUG_KERNEL=y

# CONFIG_DEBUG_SHIRQ is not set

CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set

CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0

# CONFIG_SCHED_DEBUG is not set

CONFIG_SCHEDSTATS=y

# CONFIG_TIMER_STATS is not set
@@ -1408,20 +1549,30 @@ CONFIG_DEBUG_BUGVERBOSE=y 
# CONFIG_DEBUG_INFO is not set

# CONFIG_DEBUG_VM is not set

# CONFIG_DEBUG_WRITECOUNT is not set

CONFIG_DEBUG_MEMORY_INIT=y

# CONFIG_DEBUG_LIST is not set

# CONFIG_DEBUG_SG is not set

# CONFIG_BOOT_PRINTK_DELAY is not set

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

# CONFIG_KPROBES_SANITY_TEST is not set

# CONFIG_BACKTRACE_SELF_TEST is not set

# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set

# CONFIG_LKDTM is not set

# CONFIG_FAULT_INJECTION is not set

CONFIG_HAVE_FTRACE=y

CONFIG_HAVE_DYNAMIC_FTRACE=y

# CONFIG_FTRACE is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

CONFIG_HAVE_FUNCTION_TRACER=y



#

# Tracers

#

# CONFIG_FUNCTION_TRACER is not set

# CONFIG_IRQSOFF_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_CONTEXT_SWITCH_TRACER is not set

# CONFIG_BOOT_TRACER is not set

# CONFIG_STACK_TRACER is not set

# CONFIG_DYNAMIC_PRINTK_DEBUG is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y

# CONFIG_KGDB is not set
@@ -1436,6 +1587,7 @@ CONFIG_HAVE_ARCH_KGDB=y 
CONFIG_KEYS=y

# CONFIG_KEYS_DEBUG_PROC_KEYS is not set

# CONFIG_SECURITY is not set

# CONFIG_SECURITYFS is not set

# CONFIG_SECURITY_FILE_CAPABILITIES is not set

CONFIG_XOR_BLOCKS=m

CONFIG_ASYNC_CORE=m
@@ -1446,10 +1598,12 @@ CONFIG_CRYPTO=y 
#

# Crypto core or helper

#

# CONFIG_CRYPTO_FIPS is not set

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_AEAD=y

CONFIG_CRYPTO_BLKCIPHER=y

CONFIG_CRYPTO_HASH=y

CONFIG_CRYPTO_RNG=y

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_GF128MUL=m

CONFIG_CRYPTO_NULL=m
@@ -1523,6 +1677,11 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m 
#

CONFIG_CRYPTO_DEFLATE=y

# CONFIG_CRYPTO_LZO is not set



#

# Random Number Generation

#

# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRYPTO_HW=y

# CONFIG_CRYPTO_DEV_HIFN_795X is not set
@@ -1530,7 +1689,6 @@ CONFIG_CRYPTO_HW=y 
# Library routines

#

CONFIG_BITREVERSE=y

# CONFIG_GENERIC_FIND_FIRST_BIT is not set

CONFIG_CRC_CCITT=m

CONFIG_CRC16=m

# CONFIG_CRC_T10DIF is not set