diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/arm/configs/omap_4430sdp_defconfig | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
Diffstat (limited to 'arch/arm/configs/omap_4430sdp_defconfig')
| -rw-r--r-- | arch/arm/configs/omap_4430sdp_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/omap_4430sdp_defconfig b/arch/arm/configs/omap_4430sdp_defconfig index 23e43ea4efa1..a464ca332a23 100644 --- a/arch/arm/configs/omap_4430sdp_defconfig +++ b/arch/arm/configs/omap_4430sdp_defconfig | |||
| @@ -52,8 +52,8 @@ CONFIG_FAIR_GROUP_SCHED=y | |||
| 52 | CONFIG_USER_SCHED=y | 52 | CONFIG_USER_SCHED=y |
| 53 | # CONFIG_CGROUP_SCHED is not set | 53 | # CONFIG_CGROUP_SCHED is not set |
| 54 | # CONFIG_CGROUPS is not set | 54 | # CONFIG_CGROUPS is not set |
| 55 | CONFIG_SYSFS_DEPRECATED=y | 55 | # CONFIG_SYSFS_DEPRECATED=y is not set |
| 56 | CONFIG_SYSFS_DEPRECATED_V2=y | 56 | # CONFIG_SYSFS_DEPRECATED_V2=y is not set |
| 57 | # CONFIG_RELAY is not set | 57 | # CONFIG_RELAY is not set |
| 58 | # CONFIG_NAMESPACES is not set | 58 | # CONFIG_NAMESPACES is not set |
| 59 | CONFIG_BLK_DEV_INITRD=y | 59 | CONFIG_BLK_DEV_INITRD=y |