Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts: arch/arm/mach-at91/gpio.c
This commit is contained in:
@@ -838,7 +838,7 @@ config FIREWIRE_OHCI_REMOTE_DMA
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
menuconfig BUILD_DOCSRC
|
||||
config BUILD_DOCSRC
|
||||
bool "Build targets in Documentation/ tree"
|
||||
depends on HEADERS_CHECK
|
||||
help
|
||||
|
Reference in New Issue
Block a user