ffe3150125
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAUHPmWhOxKuMESys7AQLCZRAAsZAuAK0MxZ4iuq/+fmy7Uxb1jrzLOYSb 3UgbTgXAjR0WAUHNegVZLX1Xc+12KxvMCj/8sO62Ai+wtgHeDAuUl2T0FbSZjlGK qqx/qQqTFHUfJRbm3Lu9iarZ2K49v1kTDk4C+nC8J9mEEW4WFlVPD10n90j+4hxr ZCEYril7qOQQV65oor3BT2V64+X1WDHriTLugH1o8RziRF9jh6Z2hgZAWnThcGxu lPsmXF2e7jDqGcM3gWtxZWu/yTBPxw549R+JUg4aVKho9WI5ClyjNAKnE7wtd3iW HyrylRH+ch2oeYFa5+xoyopRARUUPmujKaHU+ZI1o++eNzuw5JYiwuMlZBLyUc9I foWMSUw31U7695exyf66HiH7GEKI1PVpgJVNu41eJvl0iWSWCpKCB6Gs8Sw4xnp2 auUCYSniXHNTFhFktjNdIUAn0+1X/b/SEfb/id4GvLp1K98QGOfe8dMCC8hEnXiF 4iIViM8Sv1GB1us5huSjbMeRPbZ3x/loqEpApfgcaqcyrUR29FTE/lFQ4fj9xviL JjckPLMMZb4Ho5wrkCi5NtXJ16mx1qKzbBGDdqzmqaNdN+08rNF//kA9m9hCwgD8 XfAV286DKDC0SllZIG+Uz7YLnSZjNAUhjvWN3ipV+SdT5DGybL3uSW5tYiSAzI2E 3cayGTWINMg= =U9Qq -----END PGP SIGNATURE----- Merge tag 'disintegrate-mtd-20121009' of git://git.infradead.org/users/dhowells/linux-headers UAPI Disintegration 2012-10-09 Conflicts: MAINTAINERS arch/arm/configs/bcmring_defconfig arch/arm/mach-imx/clk-imx51-imx53.c drivers/mtd/nand/Kconfig drivers/mtd/nand/bcm_umi_nand.c drivers/mtd/nand/nand_bcm_umi.h drivers/mtd/nand/orion_nand.c
123 lines
2.6 KiB
Text
123 lines
2.6 KiB
Text
CONFIG_EXPERIMENTAL=y
|
|
CONFIG_SYSVIPC=y
|
|
CONFIG_LOG_BUF_SHIFT=14
|
|
CONFIG_BLK_DEV_INITRD=y
|
|
CONFIG_EXPERT=y
|
|
CONFIG_SLAB=y
|
|
CONFIG_MODULES=y
|
|
CONFIG_MODULE_UNLOAD=y
|
|
# CONFIG_BLK_DEV_BSG is not set
|
|
CONFIG_PARTITION_ADVANCED=y
|
|
# CONFIG_PPC_CHRP is not set
|
|
# CONFIG_PPC_PMAC is not set
|
|
CONFIG_PPC_83xx=y
|
|
CONFIG_MPC831x_RDB=y
|
|
CONFIG_MPC832x_MDS=y
|
|
CONFIG_MPC832x_RDB=y
|
|
CONFIG_MPC834x_MDS=y
|
|
CONFIG_MPC834x_ITX=y
|
|
CONFIG_MPC836x_MDS=y
|
|
CONFIG_MPC836x_RDK=y
|
|
CONFIG_MPC837x_MDS=y
|
|
CONFIG_MPC837x_RDB=y
|
|
CONFIG_SBC834x=y
|
|
CONFIG_ASP834x=y
|
|
CONFIG_QUICC_ENGINE=y
|
|
CONFIG_QE_GPIO=y
|
|
CONFIG_MATH_EMULATION=y
|
|
CONFIG_PCI=y
|
|
CONFIG_NET=y
|
|
CONFIG_PACKET=y
|
|
CONFIG_UNIX=y
|
|
CONFIG_XFRM_USER=m
|
|
CONFIG_NET_KEY=y
|
|
CONFIG_INET=y
|
|
CONFIG_IP_MULTICAST=y
|
|
CONFIG_IP_PNP=y
|
|
CONFIG_IP_PNP_DHCP=y
|
|
CONFIG_IP_PNP_BOOTP=y
|
|
CONFIG_SYN_COOKIES=y
|
|
CONFIG_INET_ESP=y
|
|
# CONFIG_INET_LRO is not set
|
|
# CONFIG_IPV6 is not set
|
|
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
|
|
CONFIG_DEVTMPFS=y
|
|
# CONFIG_FW_LOADER is not set
|
|
CONFIG_MTD=y
|
|
CONFIG_MTD_CHAR=y
|
|
CONFIG_MTD_BLOCK=y
|
|
CONFIG_MTD_CFI=y
|
|
CONFIG_MTD_CFI_AMDSTD=y
|
|
CONFIG_MTD_PHYSMAP_OF=y
|
|
CONFIG_MTD_NAND=y
|
|
CONFIG_MTD_NAND_FSL_ELBC=y
|
|
CONFIG_PROC_DEVICETREE=y
|
|
CONFIG_BLK_DEV_LOOP=y
|
|
CONFIG_BLK_DEV_RAM=y
|
|
CONFIG_BLK_DEV_RAM_SIZE=32768
|
|
CONFIG_BLK_DEV_SD=y
|
|
CONFIG_CHR_DEV_SG=y
|
|
CONFIG_ATA=y
|
|
CONFIG_SATA_FSL=y
|
|
CONFIG_SATA_SIL=y
|
|
CONFIG_NETDEVICES=y
|
|
CONFIG_MII=y
|
|
CONFIG_UCC_GETH=y
|
|
CONFIG_GIANFAR=y
|
|
CONFIG_MARVELL_PHY=y
|
|
CONFIG_DAVICOM_PHY=y
|
|
CONFIG_VITESSE_PHY=y
|
|
CONFIG_ICPLUS_PHY=y
|
|
CONFIG_FIXED_PHY=y
|
|
CONFIG_INPUT_FF_MEMLESS=m
|
|
# CONFIG_INPUT_MOUSEDEV is not set
|
|
# CONFIG_INPUT_KEYBOARD is not set
|
|
# CONFIG_INPUT_MOUSE is not set
|
|
# CONFIG_SERIO is not set
|
|
# CONFIG_VT is not set
|
|
CONFIG_SERIAL_8250=y
|
|
CONFIG_SERIAL_8250_CONSOLE=y
|
|
CONFIG_I2C=y
|
|
CONFIG_I2C_CHARDEV=y
|
|
CONFIG_I2C_MPC=y
|
|
CONFIG_WATCHDOG=y
|
|
CONFIG_VIDEO_OUTPUT_CONTROL=m
|
|
CONFIG_HID_A4TECH=y
|
|
CONFIG_HID_APPLE=y
|
|
CONFIG_HID_BELKIN=y
|
|
CONFIG_HID_CHERRY=y
|
|
CONFIG_HID_CHICONY=y
|
|
CONFIG_HID_CYPRESS=y
|
|
CONFIG_HID_EZKEY=y
|
|
CONFIG_HID_GYRATION=y
|
|
CONFIG_HID_LOGITECH=y
|
|
CONFIG_HID_MICROSOFT=y
|
|
CONFIG_HID_MONTEREY=y
|
|
CONFIG_HID_PANTHERLORD=y
|
|
CONFIG_HID_PETALYNX=y
|
|
CONFIG_HID_SAMSUNG=y
|
|
CONFIG_HID_SONY=y
|
|
CONFIG_HID_SUNPLUS=y
|
|
CONFIG_USB=y
|
|
CONFIG_USB_MON=y
|
|
CONFIG_USB_EHCI_HCD=y
|
|
CONFIG_USB_EHCI_FSL=y
|
|
CONFIG_RTC_CLASS=y
|
|
CONFIG_RTC_DRV_DS1307=y
|
|
CONFIG_RTC_DRV_DS1374=y
|
|
CONFIG_EXT2_FS=y
|
|
CONFIG_EXT3_FS=y
|
|
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
|
|
CONFIG_PROC_KCORE=y
|
|
CONFIG_TMPFS=y
|
|
CONFIG_NFS_FS=y
|
|
CONFIG_NFS_V4=y
|
|
CONFIG_ROOT_NFS=y
|
|
CONFIG_CRC_T10DIF=y
|
|
CONFIG_CRYPTO_ECB=m
|
|
CONFIG_CRYPTO_PCBC=m
|
|
CONFIG_CRYPTO_SHA256=y
|
|
CONFIG_CRYPTO_SHA512=y
|
|
CONFIG_CRYPTO_AES=y
|
|
# CONFIG_CRYPTO_ANSI_CPRNG is not set
|
|
CONFIG_CRYPTO_DEV_TALITOS=y
|