summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArkadiusz Miƛkiewicz2010-10-23 17:24:52 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commit97e49e4c8d8cc7ff1e34d0b1572a7abe565ef0f8 (patch)
tree6b443a4bd2f4cc9d22bfbf9298f4a2750784a4d5
parent5715d0ac84c8a6140ea95d33d4dace2ed46fb6e5 (diff)
downloadkernel-97e49e4c8d8cc7ff1e34d0b1572a7abe565ef0f8.zip
kernel-97e49e4c8d8cc7ff1e34d0b1572a7abe565ef0f8.tar.gz
- sort
Changed files: kernel-multiarch.config -> 1.49
-rw-r--r--kernel-multiarch.config3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 7e3bafb..9fe43d5 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -1351,6 +1351,7 @@ TOUCHSCREEN_ADS7846 all=m sparc=n
TOUCHSCREEN_AD7877 all=m
TOUCHSCREEN_AD7879 all=m
TOUCHSCREEN_AD7879_I2C all=m
+TOUCHSCREEN_AD7879_SPI all=m
TOUCHSCREEN_CY8CTMG110 all=m
TOUCHSCREEN_DA9034 all=m
TOUCHSCREEN_DYNAPRO all=m
@@ -6633,6 +6634,7 @@ DEFAULT_SECURITY all=""
#-
SECURITY_APPARMOR=y
SECURITY_APPARMOR_BOOTPARAM_VALUE=1
+SECURITY_APPARMOR_COMPAT_24=y
#-
#- *** FILE: security/integrity/ima/Kconfig ***
@@ -7077,7 +7079,6 @@ RAMZSWAP all=m
RAMZSWAP_STATS all=y
RT3090 all=m
RTL8187SE all=m
-SECURITY_APPARMOR_COMPAT_24=y
SECURITY_APPARMOR_DISABLE=n
SECURITY_APPARMOR_NETWORK=y
SECURITY_FILE_CAPABILITIES all=y