From 08f2abf879e25df564a1ed18e81a94aeb0ffec62 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sat, 15 Dec 2012 23:51:54 +0100 Subject: [PATCH] --- yaml --- r: 355408 b: refs/heads/master c: b93911e3d59bcd665a810fdf8ec7040a74eb4ff4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/sh_pfc.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 165f0a3915cd..7ede2d9c4acd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e854547bfa55660e088dffa640e7eaac61833c1a +refs/heads/master: b93911e3d59bcd665a810fdf8ec7040a74eb4ff4 diff --git a/trunk/include/linux/sh_pfc.h b/trunk/include/linux/sh_pfc.h index 9fd62282c625..13049c4c8d30 100644 --- a/trunk/include/linux/sh_pfc.h +++ b/trunk/include/linux/sh_pfc.h @@ -114,9 +114,6 @@ struct sh_pfc_soc_info { unsigned long unlock_reg; }; -/* XXX compat for now */ -#define pinmux_info sh_pfc_soc_info - enum { GPIO_CFG_DRYRUN, GPIO_CFG_REQ, GPIO_CFG_FREE }; /* helper macro for port */