aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2019-05-10 22:46:49 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2019-05-11 17:15:41 +0200
commit747587ec618c70647b1d005c60242e5611f4d35f (patch)
tree92ffa09a5324b12d18a8f2d1712205e577c95190 /target
parent87ac3e801d4ee531921dc188cf68aecf9da9108c (diff)
downloadupstream-747587ec618c70647b1d005c60242e5611f4d35f.tar.gz
upstream-747587ec618c70647b1d005c60242e5611f4d35f.tar.bz2
upstream-747587ec618c70647b1d005c60242e5611f4d35f.zip
kernel: Reorder generic configuration
This was done like this: ./scripts/kconfig.pl '+' target/linux/generic/config-4.14 /dev/null > target/linux/generic/config-4.14-new mv target/linux/generic/config-4.14-new target/linux/generic/config-4.14 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/config-4.1410
-rw-r--r--target/linux/generic/config-4.1910
2 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14
index de8341ddab..e6638ee686 100644
--- a/target/linux/generic/config-4.14
+++ b/target/linux/generic/config-4.14
@@ -1151,7 +1151,6 @@ CONFIG_DOUBLEFAULT=y
CONFIG_DQL=y
# CONFIG_DRAGONRISE_FF is not set
# CONFIG_DRM is not set
-# CONFIG_DRM_I915 is not set
# CONFIG_DRM_AMDGPU is not set
# CONFIG_DRM_AMDGPU_CIK is not set
# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
@@ -1181,6 +1180,7 @@ CONFIG_DQL=y
# CONFIG_DRM_I2C_CH7006 is not set
# CONFIG_DRM_I2C_NXP_TDA998X is not set
# CONFIG_DRM_I2C_SIL164 is not set
+# CONFIG_DRM_I915 is not set
# CONFIG_DRM_LEGACY is not set
# CONFIG_DRM_LIB_RANDOM is not set
# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
@@ -1354,8 +1354,8 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
# CONFIG_FB_DDC is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_FLEX is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_HGA is not set
@@ -4990,8 +4990,8 @@ CONFIG_TMPFS_XATTR=y
# CONFIG_TOSHIBA_HAPS is not set
# CONFIG_TOUCHSCREEN_88PM860X is not set
# CONFIG_TOUCHSCREEN_AD7877 is not set
-# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
# CONFIG_TOUCHSCREEN_ADS7846 is not set
# CONFIG_TOUCHSCREEN_AR1021_I2C is not set
@@ -5065,8 +5065,8 @@ CONFIG_TMPFS_XATTR=y
# CONFIG_TOUCHSCREEN_TS4800 is not set
# CONFIG_TOUCHSCREEN_TSC2004 is not set
# CONFIG_TOUCHSCREEN_TSC2005 is not set
-# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
# CONFIG_TOUCHSCREEN_TSC200X_CORE is not set
# CONFIG_TOUCHSCREEN_TSC_SERIO is not set
# CONFIG_TOUCHSCREEN_UCB1400 is not set
@@ -5097,8 +5097,8 @@ CONFIG_TMPFS_XATTR=y
# CONFIG_TOUCHSCREEN_WM9705 is not set
# CONFIG_TOUCHSCREEN_WM9712 is not set
# CONFIG_TOUCHSCREEN_WM9713 is not set
-# CONFIG_TOUCHSCREEN_WM97XX_ATMEL is not set
# CONFIG_TOUCHSCREEN_WM97XX is not set
+# CONFIG_TOUCHSCREEN_WM97XX_ATMEL is not set
# CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE is not set
# CONFIG_TOUCHSCREEN_WM97XX_ZYLONITE is not set
# CONFIG_TOUCHSCREEN_ZET6223 is not set
diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19
index aec00143d3..6a0c355e59 100644
--- a/target/linux/generic/config-4.19
+++ b/target/linux/generic/config-4.19
@@ -779,8 +779,8 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
# CONFIG_CHARGER_SBS is not set
# CONFIG_CHARGER_SMB347 is not set
# CONFIG_CHARGER_TWL4030 is not set
-# CONFIG_CHASH_STATS is not set
# CONFIG_CHASH_SELFTEST is not set
+# CONFIG_CHASH_STATS is not set
# CONFIG_CHECKPOINT_RESTORE is not set
# CONFIG_CHELSIO_T1 is not set
# CONFIG_CHELSIO_T3 is not set
@@ -1214,7 +1214,6 @@ CONFIG_DOUBLEFAULT=y
CONFIG_DQL=y
# CONFIG_DRAGONRISE_FF is not set
# CONFIG_DRM is not set
-# CONFIG_DRM_I915 is not set
# CONFIG_DRM_AMDGPU is not set
# CONFIG_DRM_AMDGPU_CIK is not set
# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
@@ -1248,6 +1247,7 @@ CONFIG_DQL=y
# CONFIG_DRM_I2C_NXP_TDA9950 is not set
# CONFIG_DRM_I2C_NXP_TDA998X is not set
# CONFIG_DRM_I2C_SIL164 is not set
+# CONFIG_DRM_I915 is not set
# CONFIG_DRM_LEGACY is not set
# CONFIG_DRM_LIB_RANDOM is not set
# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
@@ -1432,8 +1432,8 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
# CONFIG_FB_CYBER2000 is not set
# CONFIG_FB_DA8XX is not set
# CONFIG_FB_DDC is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_FLEX is not set
+# CONFIG_FB_FOREIGN_ENDIAN is not set
# CONFIG_FB_GEODE is not set
# CONFIG_FB_GOLDFISH is not set
# CONFIG_FB_HGA is not set
@@ -5240,8 +5240,8 @@ CONFIG_TMPFS_XATTR=y
# CONFIG_TOSHIBA_HAPS is not set
# CONFIG_TOUCHSCREEN_88PM860X is not set
# CONFIG_TOUCHSCREEN_AD7877 is not set
-# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
# CONFIG_TOUCHSCREEN_AD7879 is not set
+# CONFIG_TOUCHSCREEN_AD7879_I2C is not set
# CONFIG_TOUCHSCREEN_AD7879_SPI is not set
# CONFIG_TOUCHSCREEN_ADC is not set
# CONFIG_TOUCHSCREEN_ADS7846 is not set
@@ -5321,8 +5321,8 @@ CONFIG_TMPFS_XATTR=y
# CONFIG_TOUCHSCREEN_TS4800 is not set
# CONFIG_TOUCHSCREEN_TSC2004 is not set
# CONFIG_TOUCHSCREEN_TSC2005 is not set
-# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_TOUCHSCREEN_TSC2007_IIO is not set
# CONFIG_TOUCHSCREEN_TSC200X_CORE is not set
# CONFIG_TOUCHSCREEN_TSC_SERIO is not set
# CONFIG_TOUCHSCREEN_UCB1400 is not set