Messages in this thread | | | Date | Thu, 8 Mar 2012 17:32:44 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the akpm tree with the tip tree |
| |
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in arch/x86/Kconfig between commit da4e3302949f ("x86/geode/net5501: Add platform driver for Soekris Engineering net5501") from the tip tree and commit "geos: platform driver for Geos and Geos2 single-board computers" from the akpm 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/x86/Kconfig index 97a7a56,a985f6b..0000000 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@@ -2151,12 -2151,13 +2151,19 @@@ config ALI Note: You have to set alix.force=1 for boards with Award BIOS. +config NET5501 + bool "Soekris Engineering net5501 System Support (LEDS, GPIO, etc)" + select GPIOLIB + ---help--- + This option enables system support for the Soekris Engineering net5501. + + config GEOS + bool "Traverse Technologies GEOS System Support (LEDS, GPIO, etc)" + select GPIOLIB + depends on DMI + ---help--- + This option enables system support for the Traverse Technologies GEOS. + endif # X86_32 config AMD_NB [unhandled content-type:application/pgp-signature] | |