Messages in this thread | | | Date | Mon, 18 Mar 2013 15:06:28 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the bcm2835 tree with the arm-soc tree |
| |
Hi Stephen,
Today's linux-next merge of the bcm2835 tree got a conflict in arch/arm/Kconfig.debug between commit 29c9b7be7574 ("ARM: cns3xxx: move debug_ll code to include/debug/") from the arm-soc tree and commit f1ac922dec7e ("ARM: bcm2835: convert to multi-platform") from the bcm2835 tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/Kconfig.debug index bce30a8,a877d51..0000000 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@@ -593,7 -583,7 +597,8 @@@ endchoic config DEBUG_LL_INCLUDE string + default "debug/bcm2835.S" if DEBUG_BCM2835 + default "debug/cns3xxx.S" if DEBUG_CNS3XXX default "debug/icedcc.S" if DEBUG_ICEDCC default "debug/imx.S" if DEBUG_IMX1_UART || \ DEBUG_IMX25_UART || \ [unhandled content-type:application/pgp-signature] | |