Messages in this thread Patch in this message | ![/](/images/icornerl.gif) | | Date | Wed, 1 Dec 2010 10:43:29 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the rmobile tree with the arm tree |
| |
Hi Paul,
Today's linux-next merge of the rmobile tree got a conflict in arch/arm/mach-shmobile/Kconfig between commit 6d803ba736abb5e122dede70a4720e4843dd6df4 ("ARM: 6483/1: arm & sh: factorised duplicated clkdev.c") from the arm tree and commit 6d72ad35f1bfaf6e52ca7133cb51ce0e36f17528 ("ARM: mach-shmobile: Tidy up the Kconfig bits") from the rmobile tree.
The latter removed the lines modified by the former, so I used the latter. I also applied this merge fixup:
From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Wed, 1 Dec 2010 10:40:34 +1100 Subject: [PATCH] rmobile: merge fixup for clkdev changes
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- arch/arm/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1b219e4..9d0ba44 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -609,7 +609,7 @@ config ARCH_MSM config ARCH_SHMOBILE bool "Renesas SH-Mobile / R-Mobile" select HAVE_CLK - select COMMON_CLKDEV + select CLKDEV_LOOKUP select GENERIC_CLOCKEVENTS select NO_IOPORT select SPARSE_IRQ -- 1.7.2.3
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/
| ![\](/images/icornerr.gif) |