diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-17 22:48:18 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-17 22:48:18 -0500 |
| commit | ed408f7c0fab7ecc72f94f204f0d2607b2749f69 (patch) | |
| tree | 8c85eb47814fff6c9ea0aa6177e47555c0f9c5b1 /init | |
| parent | 52f7a82b59ff385da86a3ed17c8d9f6a83531004 (diff) | |
| parent | 7d1f9aeff1ee4a20b1aeb377dd0f579fe9647619 (diff) | |
Merge 3.9-rc4 into driver-core-next
This is to fix up a build problem with a wireless driver due to the
dynamic-debug patches in this branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 3020d81c05bc..a966690e447f 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
| @@ -1152,7 +1152,7 @@ config CC_OPTIMIZE_FOR_SIZE | |||
| 1152 | Enabling this option will pass "-Os" instead of "-O2" to gcc | 1152 | Enabling this option will pass "-Os" instead of "-O2" to gcc |
| 1153 | resulting in a smaller kernel. | 1153 | resulting in a smaller kernel. |
| 1154 | 1154 | ||
| 1155 | If unsure, say Y. | 1155 | If unsure, say N. |
| 1156 | 1156 | ||
| 1157 | config SYSCTL | 1157 | config SYSCTL |
| 1158 | bool | 1158 | bool |