From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jun 2013 01:00:29 +0000 (+1000)
Subject: Merge remote-tracking branch 'sh/sh-latest'
X-Git-Tag: next-20130619~102
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=620943dc89cfe7d2279a4d0c402d3aeda35f07e8;p=karo-tx-linux.git

Merge remote-tracking branch 'sh/sh-latest'

Conflicts:
	arch/sh/kernel/cpu/sh2a/Makefile
---

620943dc89cfe7d2279a4d0c402d3aeda35f07e8
diff --cc arch/sh/kernel/cpu/sh2a/Makefile
index 990195d98456,130984caa601..92f0da4c86a7
--- a/arch/sh/kernel/cpu/sh2a/Makefile
+++ b/arch/sh/kernel/cpu/sh2a/Makefile
@@@ -21,4 -21,5 +21,5 @@@ pinmux-$(CONFIG_CPU_SUBTYPE_SH7203)	:= 
  pinmux-$(CONFIG_CPU_SUBTYPE_SH7264)	:= pinmux-sh7264.o
  pinmux-$(CONFIG_CPU_SUBTYPE_SH7269)	:= pinmux-sh7269.o
  
 -obj-$(CONFIG_GENERIC_GPIO)		+= $(pinmux-y)
 +obj-$(CONFIG_GPIOLIB)			+= $(pinmux-y)
+ obj-$(CONFIG_HAVE_HW_BREAKPOINT)	+= ubc.o