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/migor_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/migor_defconfig')
| -rw-r--r-- | arch/sh/configs/migor_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sh/configs/migor_defconfig b/arch/sh/configs/migor_defconfig index c19fcdfdee37..cc61eda44922 100644 --- a/arch/sh/configs/migor_defconfig +++ b/arch/sh/configs/migor_defconfig | |||
| @@ -3,7 +3,6 @@ CONFIG_SYSVIPC=y | |||
| 3 | CONFIG_IKCONFIG=y | 3 | CONFIG_IKCONFIG=y |
| 4 | CONFIG_IKCONFIG_PROC=y | 4 | CONFIG_IKCONFIG_PROC=y |
| 5 | CONFIG_LOG_BUF_SHIFT=14 | 5 | CONFIG_LOG_BUF_SHIFT=14 |
| 6 | CONFIG_SYSFS_DEPRECATED_V2=y | ||
| 7 | CONFIG_BLK_DEV_INITRD=y | 6 | CONFIG_BLK_DEV_INITRD=y |
| 8 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set | 7 | # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set |
| 9 | # CONFIG_SYSCTL_SYSCALL is not set | 8 | # CONFIG_SYSCTL_SYSCALL is not set |
| @@ -55,6 +54,8 @@ CONFIG_INPUT_EVDEV=y | |||
| 55 | # CONFIG_KEYBOARD_ATKBD is not set | 54 | # CONFIG_KEYBOARD_ATKBD is not set |
| 56 | CONFIG_KEYBOARD_SH_KEYSC=y | 55 | CONFIG_KEYBOARD_SH_KEYSC=y |
| 57 | # CONFIG_INPUT_MOUSE is not set | 56 | # CONFIG_INPUT_MOUSE is not set |
| 57 | CONFIG_INPUT_TOUCHSCREEN=y | ||
| 58 | CONFIG_TOUCHSCREEN_MIGOR=y | ||
| 58 | # CONFIG_SERIO is not set | 59 | # CONFIG_SERIO is not set |
| 59 | CONFIG_VT_HW_CONSOLE_BINDING=y | 60 | CONFIG_VT_HW_CONSOLE_BINDING=y |
| 60 | CONFIG_SERIAL_SH_SCI=y | 61 | CONFIG_SERIAL_SH_SCI=y |