aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mpc85xx
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-21 16:08:19 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-21 16:08:19 +0000
commit57690041fa15b6b70545f379ddfc84df1791c5b8 (patch)
treef6c34e8c0c435806023a40f7f99345a7fbf29ba9 /target/linux/mpc85xx
parentc18d6739bcf568dda5cc28edff2d4e3096a72cb2 (diff)
downloadupstream-57690041fa15b6b70545f379ddfc84df1791c5b8.tar.gz
upstream-57690041fa15b6b70545f379ddfc84df1791c5b8.tar.bz2
upstream-57690041fa15b6b70545f379ddfc84df1791c5b8.zip
kernel: clean up redundant SLUB/SLAB related defines for 4.4
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 48443
Diffstat (limited to 'target/linux/mpc85xx')
-rw-r--r--target/linux/mpc85xx/config-4.42
-rw-r--r--target/linux/mpc85xx/p1020/config-default1
2 files changed, 0 insertions, 3 deletions
diff --git a/target/linux/mpc85xx/config-4.4 b/target/linux/mpc85xx/config-4.4
index a511afd775..5b76ec58ae 100644
--- a/target/linux/mpc85xx/config-4.4
+++ b/target/linux/mpc85xx/config-4.4
@@ -270,8 +270,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
CONFIG_SERIAL_OF_PLATFORM=y
# CONFIG_SERIAL_QE is not set
CONFIG_SIMPLE_GPIO=y
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
CONFIG_SOCK_DIAG=y
# CONFIG_SOCRATES is not set
CONFIG_SPARSE_IRQ=y
diff --git a/target/linux/mpc85xx/p1020/config-default b/target/linux/mpc85xx/p1020/config-default
index 1d15b32b67..8fd795730e 100644
--- a/target/linux/mpc85xx/p1020/config-default
+++ b/target/linux/mpc85xx/p1020/config-default
@@ -11,7 +11,6 @@ CONFIG_RCU_STALL_COMMON=y
CONFIG_RFS_ACCEL=y
CONFIG_RPS=y
CONFIG_RWSEM_SPIN_ON_OWNER=y
-CONFIG_SLUB_CPU_PARTIAL=y
CONFIG_SMP=y
CONFIG_TREE_RCU=y
CONFIG_XPS=y