aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2015-05-27 07:57:46 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-31 21:45:51 -0400
commit1c4b1d73bacc546ba4e42f7eb4cb88c54139820b (patch)
treeb10756dff4006fdbef1d6435ef9201c08a8ae357
parenta7a215283703231bcde0740710569f6c0e39ac53 (diff)
tty: move linux/gsmmux.h to uapi
linux/gsmmux.h defines a user interface and therefore should be installed with other headers. Make the file include: * linux/if.h for IFNAMSIZ * linux/ioctl.h for _IO* macros Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--include/uapi/linux/Kbuild1
-rw-r--r--include/uapi/linux/gsmmux.h (renamed from include/linux/gsmmux.h)3
2 files changed, 4 insertions, 0 deletions
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index 1a0006a76b00..1d3db6a74d1f 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -138,6 +138,7 @@ header-y += genetlink.h
138header-y += gen_stats.h 138header-y += gen_stats.h
139header-y += gfs2_ondisk.h 139header-y += gfs2_ondisk.h
140header-y += gigaset_dev.h 140header-y += gigaset_dev.h
141header-y += gsmmux.h
141header-y += hdlcdrv.h 142header-y += hdlcdrv.h
142header-y += hdlc.h 143header-y += hdlc.h
143header-y += hdreg.h 144header-y += hdreg.h
diff --git a/include/linux/gsmmux.h b/include/uapi/linux/gsmmux.h
index c25e9477f7c3..c06742d52856 100644
--- a/include/linux/gsmmux.h
+++ b/include/uapi/linux/gsmmux.h
@@ -1,6 +1,9 @@
1#ifndef _LINUX_GSMMUX_H 1#ifndef _LINUX_GSMMUX_H
2#define _LINUX_GSMMUX_H 2#define _LINUX_GSMMUX_H
3 3
4#include <linux/if.h>
5#include <linux/ioctl.h>
6
4struct gsm_config 7struct gsm_config
5{ 8{
6 unsigned int adaption; 9 unsigned int adaption;