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/powerpc/configs/c2k_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/powerpc/configs/c2k_defconfig')
| -rw-r--r-- | arch/powerpc/configs/c2k_defconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/configs/c2k_defconfig b/arch/powerpc/configs/c2k_defconfig index f9e6a3ea5a64..2a84fd7f631c 100644 --- a/arch/powerpc/configs/c2k_defconfig +++ b/arch/powerpc/configs/c2k_defconfig | |||
| @@ -132,8 +132,8 @@ CONFIG_NET_CLS_RSVP=m | |||
| 132 | CONFIG_NET_CLS_RSVP6=m | 132 | CONFIG_NET_CLS_RSVP6=m |
| 133 | CONFIG_NET_CLS_IND=y | 133 | CONFIG_NET_CLS_IND=y |
| 134 | CONFIG_BT=m | 134 | CONFIG_BT=m |
| 135 | CONFIG_BT_L2CAP=m | 135 | CONFIG_BT_L2CAP=y |
| 136 | CONFIG_BT_SCO=m | 136 | CONFIG_BT_SCO=y |
| 137 | CONFIG_BT_RFCOMM=m | 137 | CONFIG_BT_RFCOMM=m |
| 138 | CONFIG_BT_RFCOMM_TTY=y | 138 | CONFIG_BT_RFCOMM_TTY=y |
| 139 | CONFIG_BT_BNEP=m | 139 | CONFIG_BT_BNEP=m |