diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-13 17:44:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-13 17:44:51 -0400 |
| commit | 97fb44eb6bc01f4ffed4300e475aa15e44877375 (patch) | |
| tree | 481ed6efd0babe7185cae04f2fd295426b36411d /lib/Kconfig.debug | |
| parent | e4707dd3e9d0cb57597b6568a5e51fea5d6fca41 (diff) | |
| parent | 148854c65ea8046b045672fd49f4333aefaa3ab5 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/mach-at91/gpio.c
Diffstat (limited to 'lib/Kconfig.debug')
| -rw-r--r-- | lib/Kconfig.debug | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 08275a5aa00e..c536b37a11cc 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug | |||
| @@ -838,7 +838,7 @@ config FIREWIRE_OHCI_REMOTE_DMA | |||
| 838 | 838 | ||
| 839 | If unsure, say N. | 839 | If unsure, say N. |
| 840 | 840 | ||
| 841 | menuconfig BUILD_DOCSRC | 841 | config BUILD_DOCSRC |
| 842 | bool "Build targets in Documentation/ tree" | 842 | bool "Build targets in Documentation/ tree" |
| 843 | depends on HEADERS_CHECK | 843 | depends on HEADERS_CHECK |
| 844 | help | 844 | help |