diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-31 10:39:32 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-31 10:39:32 +0100 |
| commit | 483a53b310dfefdd8c010ba0cc5b2addfaef123f (patch) | |
| tree | 21cfde950458fd4e6e42682b627a71b397b09eb4 /linaro | |
| parent | 87da43c02b10e3387adfe5c69a1dae4d21ed3120 (diff) | |
| parent | cd1b5c286992a746f3d7b5817d38988383839ec8 (diff) | |
Merge branch 'v3.10/topic/configs' of git://git.linaro.org/kernel/linux-linaro-stable into linux-linaro-lsk
Diffstat (limited to 'linaro')
| -rw-r--r-- | linaro/configs/android.conf | 1 | ||||
| -rw-r--r-- | linaro/configs/bigendian.conf | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/linaro/configs/android.conf b/linaro/configs/android.conf index 0062c611f79f..e1bf601fc57d 100644 --- a/linaro/configs/android.conf +++ b/linaro/configs/android.conf @@ -34,6 +34,7 @@ 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 diff --git a/linaro/configs/bigendian.conf b/linaro/configs/bigendian.conf new file mode 100644 index 000000000000..6a1020299e85 --- /dev/null +++ b/linaro/configs/bigendian.conf @@ -0,0 +1,4 @@ +CONFIG_CPU_BIG_ENDIAN=y +CONFIG_CPU_ENDIAN_BE8=y +# CONFIG_VIRTUALIZATION is not set +# CONFIG_MMC_DW_IDMAC is not set |