diff options
| author | Dennis Gilmore <dennis@ausil.us> | 2011-12-23 10:28:07 -0600 |
|---|---|---|
| committer | Dennis Gilmore <dennis@ausil.us> | 2011-12-23 10:28:48 -0600 |
| commit | 1cbcbe6c389c712d7368ba171bd0b00fe8e32819 (patch) | |
| tree | 1ada80657844e6afa7e08fbf12f0bb23f6c88b82 /config-arm-generic | |
| parent | 534352f358b444bf67c24181516d90d4ca59ed46 (diff) | |
| download | kernel-1cbcbe6c389c712d7368ba171bd0b00fe8e32819.tar.gz kernel-1cbcbe6c389c712d7368ba171bd0b00fe8e32819.tar.xz kernel-1cbcbe6c389c712d7368ba171bd0b00fe8e32819.zip | |
pull in the arm config changes from f15
Diffstat (limited to 'config-arm-generic')
| -rw-r--r-- | config-arm-generic | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/config-arm-generic b/config-arm-generic index 1a89e6384..3141e66a5 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -44,8 +44,6 @@ CONFIG_OABI_COMPAT=y # CONFIG_UACCESS_WITH_MEMCPY is not set -CONFIG_ARM_APPENDED_DTB=y -CONFIG_ARM_ATAG_DTB_COMPAT=y CONFIG_CMDLINE="console=ttyAM0,115200 root=/dev/sda1 rootdelay=20" CONFIG_NO_HZ=y @@ -55,12 +53,10 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_LEDS=y CONFIG_LEDS_CPU=y -# CONFIG_LEDS_RENESAS_TPU is not set CONFIG_MTD_AFS_PARTS=y CONFIG_MTD_ARM_INTEGRATOR=y CONFIG_MTD_IMPA7=y -CONFIG_MTD_OF_PARTS=y CONFIG_AX88796=m CONFIG_AX88796_93CX6=y @@ -146,9 +142,6 @@ CONFIG_SPARSE_IRQ=y # CONFIG_ARM_PATCH_PHYS_VIRT is not set -CONFIG_NET_VENDOR_FARADAY=y -CONFIG_FTMAC100=m - CONFIG_HWSPINLOCK_OMAP=m CONFIG_USE_OF=y @@ -159,7 +152,12 @@ CONFIG_MMC_SDHCI_OF=m CONFIG_MMC_SDHCI_PXAV3=m CONFIG_MMC_SDHCI_PXAV2=m -CONFIG_FTGMAC100=m + +# CONFIG_FTGMAC100 is not set +# CONFIG_FTMAC100 is not set +# +CONFIG_DEFAULT_MMAP_MIN_ADDR=32768 +CONFIG_LSM_MMAP_MIN_ADDR=32768 # disable TPM on arm at least on the trimslices it causes havoc # CONFIG_TCG_TPM is not set @@ -176,9 +174,9 @@ CONFIG_FTGMAC100=m # CONFIG_DRM_RADEON is not set # CONFIG_ATM_HE is not set # CONFIG_SCSI_ACARD is not set -# CONFIG_ARM_KPROBES_TEST is not set -# CONFIG_PL330_DMA is not set -# CONFIG_VIDEO_S5K6AA is not set -CONFIG_PL310_ERRATA_753970=y -CONFIG_PL310_ERRATA_769419=y +# these all currently fail due to missing symbols __bad_udelay or +# error: implicit declaration of function ‘iowrite32be’ +# CONFIG_SND_ALI5451 is not set +# CONFIG_DRM_NOUVEAU is not set +# CONFIG_MLX4_EN is not set |