diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-05-22 14:08:20 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-05-22 14:08:20 -0700 |
| commit | a61d3b775855a1d67d97ca0aa389489cb8a9320d (patch) | |
| tree | 601436cafe7fb44be336310b47b05bbe8b04de77 | |
| parent | f97bd9e5fccad66301a486309aba96e4188a9310 (diff) | |
| parent | 28abe338d1e21160ac73ca610f5e202ef7787f7b (diff) | |
Merge branch 'v3.18/topic/configs' into linux-linaro-lsk-v3.18
* v3.18/topic/configs:
linaro/configs: preempt-rt: remove SLUB setting
linaro/configs: remove android.conf, not used
| -rw-r--r-- | linaro/configs/android.conf | 42 | ||||
| -rw-r--r-- | linaro/configs/preempt-rt.conf | 1 |
2 files changed, 0 insertions, 43 deletions
diff --git a/linaro/configs/android.conf b/linaro/configs/android.conf deleted file mode 100644 index e4fd1ad19028..000000000000 --- a/linaro/configs/android.conf +++ /dev/null @@ -1,42 +0,0 @@ -CONFIG_IPV6=y -# CONFIG_IPV6_SIT is not set -CONFIG_PANIC_TIMEOUT=0 -CONFIG_HAS_WAKELOCK=y -CONFIG_WAKELOCK=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_DM_CRYPT=y -CONFIG_POWER_SUPPLY=y -CONFIG_ANDROID_PARANOID_NETWORK=y -CONFIG_NET_ACTIVITY_STATS=y -CONFIG_INPUT_MISC=y -CONFIG_INPUT_UINPUT=y -CONFIG_INPUT_GPIO=y -CONFIG_USB_G_ANDROID=y -CONFIG_SWITCH=y -CONFIG_STAGING=y -CONFIG_ANDROID=y -CONFIG_ANDROID_BINDER_IPC=y -CONFIG_ASHMEM=y -CONFIG_ANDROID_LOGGER=y -CONFIG_ANDROID_TIMED_OUTPUT=y -CONFIG_ANDROID_TIMED_GPIO=y -CONFIG_ANDROID_LOW_MEMORY_KILLER=y -CONFIG_ANDROID_INTF_ALARM_DEV=y -CONFIG_CRYPTO_TWOFISH=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=16 -CONFIG_BLK_DEV_RAM_SIZE=16384 -CONFIG_FUSE_FS=y -CONFIG_CPU_FREQ_GOV_INTERACTIVE=y -CONFIG_CPU_FREQ_DEFAULT_GOV_INTERACTIVE=y -CONFIG_ION=y -CONFIG_SYNC=y -CONFIG_SW_SYNC=y -CONFIG_SW_SYNC_USER=y -CONFIG_ION_TEST=y -CONFIG_ION_DUMMY=y -CONFIG_ADF=y -CONFIG_ADF_FBDEV=y -CONFIG_ADF_MEMBLOCK=y -CONFIG_DMA_SHARED_BUFFER=y -CONFIG_TUN=y diff --git a/linaro/configs/preempt-rt.conf b/linaro/configs/preempt-rt.conf index 98e036d75442..7c6594f3a016 100644 --- a/linaro/configs/preempt-rt.conf +++ b/linaro/configs/preempt-rt.conf @@ -1,4 +1,3 @@ CONFIG_PREEMPT=y CONFIG_PREEMPT_RT_FULL=y -CONFIG_SLUB=y # CONFIG_CPU_FREQ is not set |