Hi Paul,
Today's linux-next merge of the genesis tree got a conflict in
arch/arm/Kconfig between commit c4ffccddd54b669cc9683f2c69e31035e916a1a0
("ARM: S5P6440: Add new Kconfig and Makefiles") from the arm tree and
commit c793c1b0c8ea11b46caf5a532752214b27a2df42 ("ARM: mach-shmobile:
SH-Mobile G3 support") from the genesis tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc arch/arm/Kconfig
index 0c9cedc,55764a1..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -602,12 -579,16 +602,17 @@@ config ARCH_MS
select GENERIC_TIME
select GENERIC_CLOCKEVENTS
help
- Support for Qualcomm MSM7K based systems. This runs on the ARM11
- apps processor of the MSM7K and depends on a shared memory
- interface to the ARM9 modem processor which runs the baseband stack
- and controls some vital subsystems (clock and power control, etc).
+ Support for Qualcomm MSM/QSD based systems. This runs on the
+ apps processor of the MSM/QSD and depends on a shared memory
+ interface to the modem processor which runs the baseband
+ stack and controls some vital subsystems
+ (clock and power control, etc).
+ config ARCH_SHMOBILE
+ bool "Renesas SH-Mobile"
+ help
+ Support for Renesas's SH-Mobile ARM platforms
+
config ARCH_RPC
bool "RiscPC"
select ARCH_ACORN
@@@ -856,8 -827,8 +861,10 @@@ source "arch/arm/mach-s3c6400/Kconfig
source "arch/arm/mach-s3c6410/Kconfig"
endif
+source "arch/arm/mach-s5p6440/Kconfig"
+
+ source "arch/arm/mach-shmobile/Kconfig"
+
source "arch/arm/plat-stmp3xxx/Kconfig"
if ARCH_S5PC1XX
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
