diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2015-10-21 01:30:35 -0500 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2015-10-21 01:30:35 -0500 |
| commit | 701f68f192e35dfc22c6a456c8a60fb4e9ff7d02 (patch) | |
| tree | 609e21a8d27831ce88bb5ba717c5a6614606c7f5 /linaro/configs/vexpress.conf | |
| parent | b00df57e50e087151f4ca976ca2796ea105f68c1 (diff) | |
| parent | f249a14dd1b6b341e7b5e29b64c0edae6e13b7f5 (diff) | |
Merge tag 'lsk-v4.1-15.09' of http://git.linaro.org/kernel/linux-linaro-stable into linux-linaro-lng-v4.1linux-lng-4.1.7-2015.10
LSK 15.09 v4.1
Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
Conflicts:
linaro/configs/distribution.conf
Diffstat (limited to 'linaro/configs/vexpress.conf')
| -rw-r--r-- | linaro/configs/vexpress.conf | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linaro/configs/vexpress.conf b/linaro/configs/vexpress.conf index f8516e3dec69..8370cf15be65 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 @@ -38,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 |