aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing/selftests/android/ion/config
diff options
context:
space:
mode:
authorAnders Roxell <anders.roxell@linaro.org>2018-08-24 14:49:41 +0200
committerShuah Khan (Samsung OSG) <shuah@kernel.org>2018-08-27 13:35:57 -0600
commit88bc243a3f22b9938c0b53c577dee28025cdb920 (patch)
tree1925800532c817cfa17d80aedbd079ac771ce0dc /tools/testing/selftests/android/ion/config
parentLinux 4.19-rc1 (diff)
downloadlinux-dev-88bc243a3f22b9938c0b53c577dee28025cdb920.tar.xz
linux-dev-88bc243a3f22b9938c0b53c577dee28025cdb920.zip
selftests: android: move config up a level
'make kselftest-merge' assumes that the config files for the tests are located under the 'main' test dir, like tools/testing/selftests/android/ and not in a subdir to android. Signed-off-by: Anders Roxell <anders.roxell@linaro.org> Signed-off-by: Shuah Khan (Samsung OSG) <shuah@kernel.org>
Diffstat (limited to 'tools/testing/selftests/android/ion/config')
-rw-r--r--tools/testing/selftests/android/ion/config5
1 files changed, 0 insertions, 5 deletions
diff --git a/tools/testing/selftests/android/ion/config b/tools/testing/selftests/android/ion/config
deleted file mode 100644
index b4ad748a9dd9..000000000000
--- a/tools/testing/selftests/android/ion/config
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_ANDROID=y
-CONFIG_STAGING=y
-CONFIG_ION=y
-CONFIG_ION_SYSTEM_HEAP=y
-CONFIG_DRM_VGEM=y