From 6ade144dba45243d86aeec2e32573d4e21e48190 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 25 Sep 2012 11:51:05 +0900
Subject: [PATCH] --- yaml --- r: 323155 b: refs/heads/master c:
 16d74ebeb1b056dfc80e69b44cc3a26515db1925 h: refs/heads/master i:   323153:
 b27dd5485294f8d09d13cf4f4355fd477cfd999e   323151:
 77eaab56c59df375058dd59c6024b53ef004b8dd v: v3

---
 [refs]                         | 2 +-
 trunk/MAINTAINERS              | 2 --
 trunk/drivers/sh/pfc/pinctrl.c | 2 ++
 trunk/include/linux/security.h | 1 -
 trunk/lib/flex_proportions.c   | 2 +-
 trunk/scripts/checksyscalls.sh | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 8114f742e1ff..cfff00d0dfea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e108a3c3268d4539e4ae538aa41bca1afb15dc3e
+refs/heads/master: 16d74ebeb1b056dfc80e69b44cc3a26515db1925
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 1796fa3a1bc1..b17587d9412f 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -5544,8 +5544,6 @@ F:	Documentation/devicetree/bindings/pwm/
 F:	include/linux/pwm.h
 F:	include/linux/of_pwm.h
 F:	drivers/pwm/
-F:	drivers/video/backlight/pwm_bl.c
-F:	include/linux/pwm_backlight.h
 
 PXA2xx/PXA3xx SUPPORT
 M:	Eric Miao <eric.y.miao@gmail.com>
diff --git a/trunk/drivers/sh/pfc/pinctrl.c b/trunk/drivers/sh/pfc/pinctrl.c
index a3ac39b79192..0646bf6e7889 100644
--- a/trunk/drivers/sh/pfc/pinctrl.c
+++ b/trunk/drivers/sh/pfc/pinctrl.c
@@ -208,6 +208,8 @@ static int sh_pfc_gpio_request_enable(struct pinctrl_dev *pctldev,
 
 		break;
 	case PINMUX_TYPE_GPIO:
+	case PINMUX_TYPE_INPUT:
+	case PINMUX_TYPE_OUTPUT:
 		break;
 	default:
 		pr_err("Unsupported mux type (%d), bailing...\n", pinmux_type);
diff --git a/trunk/include/linux/security.h b/trunk/include/linux/security.h
index d143b8e01954..3dea6a9d568f 100644
--- a/trunk/include/linux/security.h
+++ b/trunk/include/linux/security.h
@@ -118,7 +118,6 @@ void reset_security_ops(void);
 extern unsigned long mmap_min_addr;
 extern unsigned long dac_mmap_min_addr;
 #else
-#define mmap_min_addr		0UL
 #define dac_mmap_min_addr	0UL
 #endif
 
diff --git a/trunk/lib/flex_proportions.c b/trunk/lib/flex_proportions.c
index ebf3bac460b0..c785554f9523 100644
--- a/trunk/lib/flex_proportions.c
+++ b/trunk/lib/flex_proportions.c
@@ -62,7 +62,7 @@ void fprop_global_destroy(struct fprop_global *p)
  */
 bool fprop_new_period(struct fprop_global *p, int periods)
 {
-	s64 events;
+	u64 events;
 	unsigned long flags;
 
 	local_irq_save(flags);
diff --git a/trunk/scripts/checksyscalls.sh b/trunk/scripts/checksyscalls.sh
index fd8fa9aa7c4e..d24810fc6af6 100755
--- a/trunk/scripts/checksyscalls.sh
+++ b/trunk/scripts/checksyscalls.sh
@@ -200,7 +200,7 @@ EOF
 syscall_list() {
     grep '^[0-9]' "$1" | sort -n | (
 	while read nr abi name entry ; do
-	    cat <<EOF
+	    echo <<EOF
 #if !defined(__NR_${name}) && !defined(__IGNORE_${name})
 #warning syscall ${name} not implemented
 #endif