diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 09:00:57 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 09:00:57 -0700 |
commit | ca364d8388602b5c0d607c5452774833cc1ad667 (patch) | |
tree | 4c6aa0a71c89b813c73c112391005fc00e44841a /include/linux/extcon.h | |
parent | 84fd7bdf1266ee6228319903af7e58702745024d (diff) | |
parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
download | kernel_goldelico_gta04-ca364d8388602b5c0d607c5452774833cc1ad667.tar.gz kernel_goldelico_gta04-ca364d8388602b5c0d607c5452774833cc1ad667.tar.bz2 kernel_goldelico_gta04-ca364d8388602b5c0d607c5452774833cc1ad667.zip |
Merge 3.7-rc3 into tty-next
This merges the tty changes in 3.7-rc3 into tty-next
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/extcon.h')
-rw-r--r-- | include/linux/extcon.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/extcon.h b/include/linux/extcon.h index 7443a560c9d..2c26c14cd71 100644 --- a/include/linux/extcon.h +++ b/include/linux/extcon.h @@ -68,7 +68,7 @@ enum extcon_cable_name { EXTCON_VIDEO_OUT, EXTCON_MECHANICAL, }; -extern const char *extcon_cable_name[]; +extern const char extcon_cable_name[][CABLE_NAME_MAX + 1]; struct extcon_cable; |