diff options
| author | Ben Hutchings <benh@debian.org> | 2014-04-09 03:00:10 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2014-04-09 03:00:10 +0000 |
| commit | 41e81b2bf0a5acaaa7fe32d031963383259f148f (patch) | |
| tree | f049f2f5c073943b70f2ffb935e2e107077d3692 | |
| parent | a254073717e64b75b87ad4f1135a68959232fd5c (diff) | |
| download | kernel_replicant_linux-41e81b2bf0a5acaaa7fe32d031963383259f148f.tar.gz kernel_replicant_linux-41e81b2bf0a5acaaa7fe32d031963383259f148f.tar.bz2 kernel_replicant_linux-41e81b2bf0a5acaaa7fe32d031963383259f148f.zip | |
Move common ARM config symbols from armel/config to kernelarch-arm/config
It is inconsistent and potentially surprising that armhf uses
armel/config as well as armhf/config. Move the common config into a
new kernelarch-arm directory.
While we're at it, remove some redundant lines from both files.
svn path=/dists/trunk/linux/; revision=21221
| -rw-r--r-- | debian/config/armel/defines | 2 | ||||
| -rw-r--r-- | debian/config/armhf/config | 12 | ||||
| -rw-r--r-- | debian/config/armhf/defines | 2 | ||||
| -rw-r--r-- | debian/config/kernelarch-arm/config (renamed from debian/config/armel/config) | 10 |
4 files changed, 3 insertions, 23 deletions
diff --git a/debian/config/armel/defines b/debian/config/armel/defines index e3f005b4315f..3d8ad9255427 100644 --- a/debian/config/armel/defines +++ b/debian/config/armel/defines @@ -9,6 +9,8 @@ kernel-arch: arm [image] suggests: fdutils +configs: + kernelarch-arm/config [relations] headers%gcc-4.8: linux-compiler-gcc-4.8-arm diff --git a/debian/config/armhf/config b/debian/config/armhf/config index 75a2cafe2435..a639ae4cc7df 100644 --- a/debian/config/armhf/config +++ b/debian/config/armhf/config @@ -7,12 +7,6 @@ CONFIG_ATAGS_PROC=y CONFIG_VFP=y ## -## file: crypto/Kconfig -## -CONFIG_CRYPTO_SHA1_ARM=m -CONFIG_CRYPTO_AES_ARM=m - -## ## file: drivers/input/mouse/Kconfig ## CONFIG_MOUSE_PS2_LOGIPS2PP=y @@ -29,9 +23,3 @@ CONFIG_MOUSE_PS2_TRACKPOINT=y # CONFIG_BAYCOM_EPP is not set # CONFIG_YAM is not set -## -## file: drivers/thermal/Kconfig -## -CONFIG_THERMAL=y -CONFIG_CPU_THERMAL=y - diff --git a/debian/config/armhf/defines b/debian/config/armhf/defines index 33801fc3e579..82ba7d77a456 100644 --- a/debian/config/armhf/defines +++ b/debian/config/armhf/defines @@ -7,7 +7,7 @@ kernel-arch: arm [image] suggests: fdutils configs: - armel/config + kernelarch-arm/config armhf/config [relations] diff --git a/debian/config/armel/config b/debian/config/kernelarch-arm/config index f33adc4d3a0d..f58bd8bd96ed 100644 --- a/debian/config/armel/config +++ b/debian/config/kernelarch-arm/config @@ -47,16 +47,6 @@ CONFIG_MOUSE_APPLETOUCH=m CONFIG_MTD_PHYSMAP=y ## -## file: drivers/net/hamradio/Kconfig -## -CONFIG_BPQETHER=m -CONFIG_BAYCOM_SER_FDX=m -CONFIG_BAYCOM_SER_HDX=m -CONFIG_BAYCOM_PAR=m -CONFIG_BAYCOM_EPP=m -CONFIG_YAM=m - -## ## file: drivers/net/wireless/ipw2x00/Kconfig ## # CONFIG_IPW2100 is not set |