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 /drivers/ssb/Kconfig | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/ssb/Kconfig')
| -rw-r--r-- | drivers/ssb/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig index 2d8cc455dbc7..42cdaa9a4d8a 100644 --- a/drivers/ssb/Kconfig +++ b/drivers/ssb/Kconfig | |||
| @@ -82,7 +82,7 @@ config SSB_SDIOHOST | |||
| 82 | 82 | ||
| 83 | config SSB_SILENT | 83 | config SSB_SILENT |
| 84 | bool "No SSB kernel messages" | 84 | bool "No SSB kernel messages" |
| 85 | depends on SSB && EMBEDDED | 85 | depends on SSB && EXPERT |
| 86 | help | 86 | help |
| 87 | This option turns off all Sonics Silicon Backplane printks. | 87 | This option turns off all Sonics Silicon Backplane printks. |
| 88 | Note that you won't be able to identify problems, once | 88 | Note that you won't be able to identify problems, once |