diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-01-31 09:13:14 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-01-31 09:13:14 -0500 |
| commit | ea51e5040e24eefe44d70bc654a237ca1f0225b0 (patch) | |
| tree | df2e5922dcdfafae62a10d8cd97f98121064fc23 /drivers/input/input.c | |
| parent | 3422a47041b8cb8f14ac1e3926bcf711121df6dc (diff) | |
| parent | 8dbd52daee38adaae4d5a674bcca837e694a4f4c (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'drivers/input/input.c')
| -rw-r--r-- | drivers/input/input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c index da38d97a51b1..1f78c957a75a 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c | |||
| @@ -1624,7 +1624,7 @@ static struct device_type input_dev_type = { | |||
| 1624 | #endif | 1624 | #endif |
| 1625 | }; | 1625 | }; |
| 1626 | 1626 | ||
| 1627 | static char *input_devnode(struct device *dev, mode_t *mode) | 1627 | static char *input_devnode(struct device *dev, umode_t *mode) |
| 1628 | { | 1628 | { |
| 1629 | return kasprintf(GFP_KERNEL, "input/%s", dev_name(dev)); | 1629 | return kasprintf(GFP_KERNEL, "input/%s", dev_name(dev)); |
| 1630 | } | 1630 | } |