Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 313773
b: refs/heads/master
c: 5440711
h: refs/heads/master
i:
  313771: b9422c1
v: v3
  • Loading branch information
Paul Mundt committed Jul 20, 2012
1 parent 1dc7fbd commit c7f4bfb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e3f805e897320c3c25d7d5f67e0fb59c5a7199bc
refs/heads/master: 5440711073157576eb4658c19019b66b25140860
12 changes: 7 additions & 5 deletions trunk/drivers/sh/pfc/pinctrl.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*/
#define pr_fmt(fmt) "sh_pfc " KBUILD_MODNAME ": " fmt
#define DRV_NAME "pinctrl-sh_pfc"

#define pr_fmt(fmt) DRV_NAME " " KBUILD_MODNAME ": " fmt

#include <linux/init.h>
#include <linux/module.h>
Expand Down Expand Up @@ -265,12 +267,12 @@ static struct pinconf_ops sh_pfc_pinconf_ops = {
};

static struct pinctrl_gpio_range sh_pfc_gpio_range = {
.name = KBUILD_MODNAME,
.name = DRV_NAME,
.id = 0,
};

static struct pinctrl_desc sh_pfc_pinctrl_desc = {
.name = KBUILD_MODNAME,
.name = DRV_NAME,
.owner = THIS_MODULE,
.pctlops = &sh_pfc_pinctrl_ops,
.pmxops = &sh_pfc_pinmux_ops,
Expand Down Expand Up @@ -448,13 +450,13 @@ static struct platform_driver sh_pfc_pinctrl_driver = {
.probe = sh_pfc_pinctrl_probe,
.remove = __devexit_p(sh_pfc_pinctrl_remove),
.driver = {
.name = KBUILD_MODNAME,
.name = DRV_NAME,
.owner = THIS_MODULE,
},
};

static struct platform_device sh_pfc_pinctrl_device = {
.name = KBUILD_MODNAME,
.name = DRV_NAME,
.id = -1,
};

Expand Down

0 comments on commit c7f4bfb

Please sign in to comment.