From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 19 Jul 2013 00:12:04 +0000 (+1000)
Subject: Merge remote-tracking branch 'sh/sh-latest'
X-Git-Tag: next-20130719~67
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e9c5c65311634b51e233a31521d1b0bd74c47f99;p=karo-tx-linux.git

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

Conflicts:
	arch/sh/kernel/cpu/sh2a/Makefile
	include/linux/serial_sci.h
---

e9c5c65311634b51e233a31521d1b0bd74c47f99
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
diff --cc include/linux/serial_sci.h
index d34049712a4d,857eec4336e3..dca3c08d4141
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
@@@ -16,7 -18,8 +18,9 @@@ enum 
  	SCBRR_ALGO_3,		/* (((clk * 2) + 16 * bps) / (16 * bps) - 1) */
  	SCBRR_ALGO_4,		/* (((clk * 2) + 16 * bps) / (32 * bps) - 1) */
  	SCBRR_ALGO_5,		/* (((clk * 1000 / 32) / bps) - 1) */
 +	SCBRR_ALGO_6,		/* HSCIF variable sample rate algorithm */
+ 
+ 	SCBRR_NR_ALGOS,
  };
  
  #define SCSCR_TIE	(1 << 7)