diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2012-12-15 23:50:45 +0100 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-01-25 09:24:21 +0900 |
commit | f9492fda70c87b410e61675095212dc806bdf615 (patch) | |
tree | c93658fb54a61a70e0f612345abe59cbb72c7de9 /drivers/sh/pfc/Makefile | |
parent | f9165132c5ee681235068857e4f86c7ecc5a4617 (diff) | |
download | linux-f9492fda70c87b410e61675095212dc806bdf615.tar.gz linux-f9492fda70c87b410e61675095212dc806bdf615.tar.bz2 linux-f9492fda70c87b410e61675095212dc806bdf615.zip |
sh-pfc: Merge PFC core and pinctrl
The PFC core is only used by the pinctrl and gpio modules. As the gpio
module depends on the pinctrl module, the pinctrl module will always be
present if the core gets used. There is thus no point in keeping core
and pinctrl in two seperate modules. Merge them.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'drivers/sh/pfc/Makefile')
-rw-r--r-- | drivers/sh/pfc/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sh/pfc/Makefile b/drivers/sh/pfc/Makefile index 7916027cce37..ce6fae353844 100644 --- a/drivers/sh/pfc/Makefile +++ b/drivers/sh/pfc/Makefile @@ -1,3 +1,3 @@ -obj-y += core.o -obj-$(CONFIG_PINCTRL_SH_PFC) += pinctrl.o +sh-pfc-objs = core.o pinctrl.o +obj-y += sh-pfc.o obj-$(CONFIG_GPIO_SH_PFC) += gpio.o |