linux-next: manual merge of the akpm-current tree with the omap_dss2 tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in:

  drivers/video/console/Kconfig

between commit:

  48fd8ecf29e3 ("framebuffer: disable vgacon on microblaze arch")

from the omap_dss2 tree and commit:

  4b9939fb41ee ("drivers/video/concole: add negative dependency for VGA_CONSOLE on ARC")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

Another place begging for a controlling CONFIG_ symbol that other
places can select (or a negative symbol).
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/video/console/Kconfig
index e0dc0fee4ea6,071280643db7..000000000000
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@@ -9,7 -9,7 +9,7 @@@ config VGA_CONSOL
  	depends on !4xx && !8xx && !SPARC && !M68K && !PARISC && !FRV && \
  		!SUPERH && !BLACKFIN && !AVR32 && !MN10300 && !CRIS && \
  		(!ARM || ARCH_FOOTBRIDGE || ARCH_INTEGRATOR || ARCH_NETWINDER) && \
- 		!ARM64 && !MICROBLAZE
 -		!ARM64 && !ARC
++		!ARM64 && !MICROBLAZE && !ARC
  	default y
  	help
  	  Saying Y here will allow you to use Linux in text mode through a
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/