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/um/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/um/defconfig')
| -rw-r--r-- | arch/um/defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/um/defconfig b/arch/um/defconfig index 6bd456f96f90..9f7634f08cf3 100644 --- a/arch/um/defconfig +++ b/arch/um/defconfig | |||
| @@ -133,7 +133,7 @@ CONFIG_SYSFS_DEPRECATED=y | |||
| 133 | # CONFIG_BLK_DEV_INITRD is not set | 133 | # CONFIG_BLK_DEV_INITRD is not set |
| 134 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 134 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 135 | CONFIG_SYSCTL=y | 135 | CONFIG_SYSCTL=y |
| 136 | # CONFIG_EMBEDDED is not set | 136 | # CONFIG_EXPERT is not set |
| 137 | CONFIG_UID16=y | 137 | CONFIG_UID16=y |
| 138 | CONFIG_SYSCTL_SYSCALL=y | 138 | CONFIG_SYSCTL_SYSCALL=y |
| 139 | CONFIG_KALLSYMS=y | 139 | CONFIG_KALLSYMS=y |
| @@ -566,7 +566,6 @@ CONFIG_CRC32=m | |||
| 566 | # CONFIG_CRC7 is not set | 566 | # CONFIG_CRC7 is not set |
| 567 | # CONFIG_LIBCRC32C is not set | 567 | # CONFIG_LIBCRC32C is not set |
| 568 | CONFIG_PLIST=y | 568 | CONFIG_PLIST=y |
| 569 | CONFIG_HAS_DMA=y | ||
| 570 | 569 | ||
| 571 | # | 570 | # |
| 572 | # SCSI device support | 571 | # SCSI device support |