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/ps3_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/ps3_defconfig')
| -rw-r--r-- | arch/powerpc/configs/ps3_defconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/configs/ps3_defconfig b/arch/powerpc/configs/ps3_defconfig index 49cffe003657..185c292b0f1c 100644 --- a/arch/powerpc/configs/ps3_defconfig +++ b/arch/powerpc/configs/ps3_defconfig | |||
| @@ -8,7 +8,7 @@ CONFIG_SYSVIPC=y | |||
| 8 | CONFIG_POSIX_MQUEUE=y | 8 | CONFIG_POSIX_MQUEUE=y |
| 9 | CONFIG_NAMESPACES=y | 9 | CONFIG_NAMESPACES=y |
| 10 | CONFIG_BLK_DEV_INITRD=y | 10 | CONFIG_BLK_DEV_INITRD=y |
| 11 | CONFIG_EMBEDDED=y | 11 | CONFIG_EXPERT=y |
| 12 | CONFIG_KALLSYMS_EXTRA_PASS=y | 12 | CONFIG_KALLSYMS_EXTRA_PASS=y |
| 13 | # CONFIG_PERF_EVENTS is not set | 13 | # CONFIG_PERF_EVENTS is not set |
| 14 | # CONFIG_COMPAT_BRK is not set | 14 | # CONFIG_COMPAT_BRK is not set |
| @@ -52,8 +52,8 @@ CONFIG_IP_PNP_DHCP=y | |||
| 52 | # CONFIG_INET_DIAG is not set | 52 | # CONFIG_INET_DIAG is not set |
| 53 | CONFIG_IPV6=y | 53 | CONFIG_IPV6=y |
| 54 | CONFIG_BT=m | 54 | CONFIG_BT=m |
| 55 | CONFIG_BT_L2CAP=m | 55 | CONFIG_BT_L2CAP=y |
| 56 | CONFIG_BT_SCO=m | 56 | CONFIG_BT_SCO=y |
| 57 | CONFIG_BT_RFCOMM=m | 57 | CONFIG_BT_RFCOMM=m |
| 58 | CONFIG_BT_RFCOMM_TTY=y | 58 | CONFIG_BT_RFCOMM_TTY=y |
| 59 | CONFIG_BT_BNEP=m | 59 | CONFIG_BT_BNEP=m |
| @@ -141,7 +141,7 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y | |||
| 141 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set | 141 | # CONFIG_USB_EHCI_HCD_PPC_OF is not set |
| 142 | CONFIG_USB_OHCI_HCD=m | 142 | CONFIG_USB_OHCI_HCD=m |
| 143 | CONFIG_USB_STORAGE=m | 143 | CONFIG_USB_STORAGE=m |
| 144 | CONFIG_RTC_CLASS=m | 144 | CONFIG_RTC_CLASS=y |
| 145 | CONFIG_RTC_DRV_PS3=m | 145 | CONFIG_RTC_DRV_PS3=m |
| 146 | CONFIG_EXT2_FS=m | 146 | CONFIG_EXT2_FS=m |
| 147 | CONFIG_EXT3_FS=m | 147 | CONFIG_EXT3_FS=m |