diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/sh/configs/ecovec24_defconfig | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/sh/configs/ecovec24_defconfig')
| -rw-r--r-- | arch/sh/configs/ecovec24_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/configs/ecovec24_defconfig b/arch/sh/configs/ecovec24_defconfig index 8d13e8a5a750..911e30c9abfd 100644 --- a/arch/sh/configs/ecovec24_defconfig +++ b/arch/sh/configs/ecovec24_defconfig | |||
| @@ -115,7 +115,7 @@ CONFIG_USB_GADGET=y | |||
| 115 | CONFIG_USB_FILE_STORAGE=m | 115 | CONFIG_USB_FILE_STORAGE=m |
| 116 | CONFIG_MMC=y | 116 | CONFIG_MMC=y |
| 117 | CONFIG_MMC_SPI=y | 117 | CONFIG_MMC_SPI=y |
| 118 | CONFIG_MMC_TMIO=y | 118 | CONFIG_MMC_SDHI=y |
| 119 | CONFIG_RTC_CLASS=y | 119 | CONFIG_RTC_CLASS=y |
| 120 | CONFIG_RTC_DRV_RS5C372=y | 120 | CONFIG_RTC_DRV_RS5C372=y |
| 121 | CONFIG_UIO=y | 121 | CONFIG_UIO=y |