Messages in this thread | | | Date | Mon, 23 Apr 2012 15:44:20 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the modem-shm tree with the driver-core tree |
| |
Hi all,
Today's linux-next merge of the modem-shm tree got a conflict in drivers/Kconfig between commit de55d8716ac5 ("Extcon (external connector): import Android's switch class and modify") from the driver-core tree and commit 021fd6178bcd ("modem_shm: Makefile and Kconfig for M7400 Shared Memory Drivers") from the modem-shm 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 drivers/Kconfig index 0233ad9,918e943..0000000 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@@ -140,6 -136,6 +140,8 @@@ source "drivers/virt/Kconfig source "drivers/devfreq/Kconfig" +source "drivers/extcon/Kconfig" + + source "drivers/modem_shm/Kconfig" + endmenu [unhandled content-type:application/pgp-signature] | |