Messages in this thread | | | Date | Fri, 17 Feb 2012 15:37:49 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the irqdomain tree with the arm tree |
| |
Hi Grant,
Today's linux-next merge of the irqdomain tree got a conflict in arch/c6x/Kconfig between commit 2ed86b16eabe ("irq: make SPARSE_IRQ an optionally hidden option") from the arm tree and commit 0bd761e1b6d9 ("irq_domain/c6x: Convert c6x to use generic irq_domain support") from the irqdomain tree.
Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/c6x/Kconfig index 2f58c61,3c64b28..0000000 --- a/arch/c6x/Kconfig +++ b/arch/c6x/Kconfig @@@ -11,7 -11,8 +11,8 @@@ config TMS320C6 select HAVE_DMA_API_DEBUG select HAVE_GENERIC_HARDIRQS select HAVE_MEMBLOCK - select HAVE_SPARSE_IRQ + select SPARSE_IRQ + select IRQ_DOMAIN select OF select OF_EARLY_FLATTREE [unhandled content-type:application/pgp-signature] | |