diff --git a/[refs] b/[refs] index d041142ff89d..5ef5d8950887 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a18d7f9660a9037c4b9c41590220e6bb77768a5e +refs/heads/master: 72c7afa10f272710028f244da65d35e571144085 diff --git a/trunk/include/linux/sh_pfc.h b/trunk/include/linux/sh_pfc.h index f522550fc32b..8c4cbcb9064d 100644 --- a/trunk/include/linux/sh_pfc.h +++ b/trunk/include/linux/sh_pfc.h @@ -11,6 +11,7 @@ #ifndef __SH_PFC_H #define __SH_PFC_H +#include #include typedef unsigned short pinmux_enum_t; @@ -37,10 +38,11 @@ enum { struct pinmux_gpio { pinmux_enum_t enum_id; pinmux_flag_t flags; + const char *name; }; #define PINMUX_GPIO(gpio, data_or_mark) \ - [gpio] = { .enum_id = data_or_mark, .flags = PINMUX_TYPE_NONE } + [gpio] = { .name = __stringify(gpio), .enum_id = data_or_mark, .flags = PINMUX_TYPE_NONE } #define PINMUX_DATA(data_or_mark, ids...) data_or_mark, ids, 0