Hi Matthew,
Today's linux-next merge of the drivers-x86 tree got a conflicts in
arch/x86/Kconfig and arch/x86/platform/geode/Makefile between commit
da4e3302949f ("x86/geode/net5501: Add platform driver for Soekris
Engineering net5501") from the tip tree and commit b2a2f19ad3db ("geos:
Platform driver for Geos and Geos2 single-board computers") from the
drivers-x86 tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/x86/Kconfig
index 36d459e,3a38c4c..0000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -2146,12 -2133,13 +2146,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
diff --cc arch/x86/platform/geode/Makefile
index 246b788,d8ba564..0000000
--- a/arch/x86/platform/geode/Makefile
+++ b/arch/x86/platform/geode/Makefile
@@@ -1,2 -1,2 +1,3 @@@
obj-$(CONFIG_ALIX) += alix.o
+obj-$(CONFIG_NET5501) += net5501.o
+ obj-$(CONFIG_GEOS) += geos.o
Attachment:
pgpj2ybLptgxY.pgp
Description: PGP signature
