From e1dcd217ed92bc1dbf93e2632d953cffb14992c3 Mon Sep 17 00:00:00 2001 From: Jon Medhurst Date: Mon, 13 Jul 2015 16:11:48 +0100 Subject: configs: vexpress: Remove obsolete CONFIG_ARCH_VEXPRESS_CA9X4 The config was removed in Linux 3.19 by commit 81cc3f868d30 ("ARM: vexpress: Remove non-DT code") Signed-off-by: Jon Medhurst --- linaro/configs/vexpress.conf | 1 - 1 file changed, 1 deletion(-) (limited to 'linaro/configs/vexpress.conf') diff --git a/linaro/configs/vexpress.conf b/linaro/configs/vexpress.conf index f8516e3dec69..45618ce430a9 100644 --- a/linaro/configs/vexpress.conf +++ b/linaro/configs/vexpress.conf @@ -1,5 +1,4 @@ CONFIG_ARCH_VEXPRESS=y -CONFIG_ARCH_VEXPRESS_CA9X4=y CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_NR_CPUS=8 CONFIG_HIGHMEM=y -- cgit v1.2.3 From 1fa2cffb7305f4be11624a460a8a7595b9ad756f Mon Sep 17 00:00:00 2001 From: Jon Medhurst Date: Mon, 13 Jul 2015 11:37:13 +0100 Subject: configs: vexpress: Fix USB config for Linux 4.0 The config option for the USB device was changed in Linux 4.0 by commit 100832abf065 ("usb: isp1760: Make HCD support optional") Signed-off-by: Jon Medhurst --- linaro/configs/vexpress.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linaro/configs/vexpress.conf') diff --git a/linaro/configs/vexpress.conf b/linaro/configs/vexpress.conf index 45618ce430a9..8370cf15be65 100644 --- a/linaro/configs/vexpress.conf +++ b/linaro/configs/vexpress.conf @@ -37,7 +37,7 @@ CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_ARMAACI=y CONFIG_USB=y -CONFIG_USB_ISP1760_HCD=y +CONFIG_USB_ISP1760=y CONFIG_USB_STORAGE=y CONFIG_MMC=y CONFIG_MMC_ARMMMCI=y -- cgit v1.2.3