diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-07-14 21:06:55 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-07-14 21:06:55 +0300 |
| commit | 55b8e9f17b2bdb3acab2d5595bf176fc31e0102c (patch) | |
| tree | 45a7d7e5e4d7047a6fc9e1e788f710d15cf80cde | |
| parent | 05317a569136a29e069c30f9af9ec620f70e38db (diff) | |
| parent | 1fa2cffb7305f4be11624a460a8a7595b9ad756f (diff) | |
Merge branch 'config-boards-tracking' into config-tracking
| -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 f8516e3dec6..8370cf15be6 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 |