diff options
| -rw-r--r-- | arch/arm/configs/armadillo800eva_defconfig | 5 | ||||
| -rw-r--r-- | arch/arm/configs/mackerel_defconfig | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig index f9e270149a77..0b98100d2ae7 100644 --- a/arch/arm/configs/armadillo800eva_defconfig +++ b/arch/arm/configs/armadillo800eva_defconfig | |||
| @@ -90,14 +90,11 @@ CONFIG_I2C_SH_MOBILE=y | |||
| 90 | # CONFIG_HWMON is not set | 90 | # CONFIG_HWMON is not set |
| 91 | CONFIG_MEDIA_SUPPORT=y | 91 | CONFIG_MEDIA_SUPPORT=y |
| 92 | CONFIG_VIDEO_DEV=y | 92 | CONFIG_VIDEO_DEV=y |
| 93 | # CONFIG_RC_CORE is not set | 93 | CONFIG_MEDIA_CAMERA_SUPPORT=y |
| 94 | # CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set | ||
| 95 | # CONFIG_V4L_USB_DRIVERS is not set | ||
| 96 | CONFIG_V4L_PLATFORM_DRIVERS=y | 94 | CONFIG_V4L_PLATFORM_DRIVERS=y |
| 97 | CONFIG_SOC_CAMERA=y | 95 | CONFIG_SOC_CAMERA=y |
| 98 | CONFIG_SOC_CAMERA_MT9T112=y | 96 | CONFIG_SOC_CAMERA_MT9T112=y |
| 99 | CONFIG_VIDEO_SH_MOBILE_CEU=y | 97 | CONFIG_VIDEO_SH_MOBILE_CEU=y |
| 100 | # CONFIG_RADIO_ADAPTERS is not set | ||
| 101 | CONFIG_FB=y | 98 | CONFIG_FB=y |
| 102 | CONFIG_FB_SH_MOBILE_LCDC=y | 99 | CONFIG_FB_SH_MOBILE_LCDC=y |
| 103 | CONFIG_FB_SH_MOBILE_HDMI=y | 100 | CONFIG_FB_SH_MOBILE_HDMI=y |
diff --git a/arch/arm/configs/mackerel_defconfig b/arch/arm/configs/mackerel_defconfig index e6881accf96a..7594b3aff259 100644 --- a/arch/arm/configs/mackerel_defconfig +++ b/arch/arm/configs/mackerel_defconfig | |||
| @@ -25,6 +25,7 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 | |||
| 25 | CONFIG_ZBOOT_ROM_BSS=0x0 | 25 | CONFIG_ZBOOT_ROM_BSS=0x0 |
| 26 | CONFIG_ARM_APPENDED_DTB=y | 26 | CONFIG_ARM_APPENDED_DTB=y |
| 27 | CONFIG_KEXEC=y | 27 | CONFIG_KEXEC=y |
| 28 | CONFIG_VFP=y | ||
| 28 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | 29 | # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set |
| 29 | CONFIG_PM=y | 30 | CONFIG_PM=y |
| 30 | CONFIG_PM_RUNTIME=y | 31 | CONFIG_PM_RUNTIME=y |
