diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-09-05 10:22:45 -0400 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-09-05 10:22:45 -0400 |
| commit | 593d0a3e9f813db910dc50574532914db21d09ff (patch) | |
| tree | 12d8413ee57b4383ca8c906996ffe02be6d377a5 /arch/powerpc/configs/mpc85xx_defconfig | |
| parent | 50e900417b8096939d12a46848f965e27a905e36 (diff) | |
| parent | 4cb38750d49010ae72e718d46605ac9ba5a851b4 (diff) | |
Merge commit '4cb38750d49010ae72e718d46605ac9ba5a851b4' into stable/for-linus-3.6
* commit '4cb38750d49010ae72e718d46605ac9ba5a851b4': (6849 commits)
bcma: fix invalid PMU chip control masks
[libata] pata_cmd64x: whitespace cleanup
libata-acpi: fix up for acpi_pm_device_sleep_state API
sata_dwc_460ex: device tree may specify dma_channel
ahci, trivial: fixed coding style issues related to braces
ahci_platform: add hibernation callbacks
libata-eh.c: local functions should not be exposed globally
libata-transport.c: local functions should not be exposed globally
sata_dwc_460ex: support hardreset
ata: use module_pci_driver
drivers/ata/pata_pcmcia.c: adjust suspicious bit operation
pata_imx: Convert to clk_prepare_enable/clk_disable_unprepare
ahci: Enable SB600 64bit DMA on MSI K9AGM2 (MS-7327) v2
[libata] Prevent interface errors with Seagate FreeAgent GoFlex
drivers/acpi/glue: revert accidental license-related 6b66d95895c bits
libata-acpi: add missing inlines in libata.h
i2c-omap: Add support for I2C_M_STOP message flag
i2c: Fall back to emulated SMBus if the operation isn't supported natively
i2c: Add SCCB support
i2c-tiny-usb: Add support for the Robofuzz OSIF USB/I2C converter
...
Diffstat (limited to 'arch/powerpc/configs/mpc85xx_defconfig')
| -rw-r--r-- | arch/powerpc/configs/mpc85xx_defconfig | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig index 62bb723c5b54..03ee911c4577 100644 --- a/arch/powerpc/configs/mpc85xx_defconfig +++ b/arch/powerpc/configs/mpc85xx_defconfig | |||
| @@ -74,6 +74,30 @@ CONFIG_INET_ESP=y | |||
| 74 | CONFIG_IPV6=y | 74 | CONFIG_IPV6=y |
| 75 | CONFIG_IP_SCTP=m | 75 | CONFIG_IP_SCTP=m |
| 76 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | 76 | CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" |
| 77 | CONFIG_MTD=y | ||
| 78 | CONFIG_MTD_CMDLINE_PARTS=y | ||
| 79 | CONFIG_MTD_CHAR=y | ||
| 80 | CONFIG_MTD_BLOCK=y | ||
| 81 | CONFIG_MTD_CFI=y | ||
| 82 | CONFIG_FTL=y | ||
| 83 | CONFIG_MTD_GEN_PROBE=y | ||
| 84 | CONFIG_MTD_MAP_BANK_WIDTH_1=y | ||
| 85 | CONFIG_MTD_MAP_BANK_WIDTH_2=y | ||
| 86 | CONFIG_MTD_MAP_BANK_WIDTH_4=y | ||
| 87 | CONFIG_MTD_CFI_I1=y | ||
| 88 | CONFIG_MTD_CFI_I2=y | ||
| 89 | CONFIG_MTD_CFI_INTELEXT=y | ||
| 90 | CONFIG_MTD_CFI_AMDSTD=y | ||
| 91 | CONFIG_MTD_CFI_UTIL=y | ||
| 92 | CONFIG_MTD_PHYSMAP_OF=y | ||
| 93 | CONFIG_MTD_PARTITIONS=y | ||
| 94 | CONFIG_MTD_OF_PARTS=y | ||
| 95 | CONFIG_MTD_NAND=y | ||
| 96 | CONFIG_MTD_NAND_FSL_ELBC=y | ||
| 97 | CONFIG_MTD_NAND_FSL_IFC=y | ||
| 98 | CONFIG_MTD_NAND_IDS=y | ||
| 99 | CONFIG_MTD_NAND_ECC=y | ||
| 100 | CONFIG_MTD_M25P80=y | ||
| 77 | CONFIG_PROC_DEVICETREE=y | 101 | CONFIG_PROC_DEVICETREE=y |
| 78 | CONFIG_BLK_DEV_LOOP=y | 102 | CONFIG_BLK_DEV_LOOP=y |
| 79 | CONFIG_BLK_DEV_NBD=y | 103 | CONFIG_BLK_DEV_NBD=y |