From ccf0907c6438e7f1e2c90292caf9bfdf17928c8c Mon Sep 17 00:00:00 2001 From: David Howells Date: Wed, 7 Nov 2012 02:37:17 +0000 Subject: [PATCH] --- yaml --- r: 340713 b: refs/heads/master c: d77807230e1ef30dbdee85aa24d27073a14dd168 h: refs/heads/master i: 340711: 19cf23f895764d37f266ca11350aa2f94faeba6d v: v3 --- [refs] | 2 +- trunk/include/linux/hdlc/Kbuild | 1 - trunk/include/uapi/linux/hdlc/Kbuild | 1 + trunk/include/{ => uapi}/linux/hdlc/ioctl.h | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) rename trunk/include/{ => uapi}/linux/hdlc/ioctl.h (98%) diff --git a/[refs] b/[refs] index 628e7979b075..9bde1907995a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bdd4f8cbd2c9b9dc7e51c668fd9043ac0af4243d +refs/heads/master: d77807230e1ef30dbdee85aa24d27073a14dd168 diff --git a/trunk/include/linux/hdlc/Kbuild b/trunk/include/linux/hdlc/Kbuild index 1fb26448faa9..e69de29bb2d1 100644 --- a/trunk/include/linux/hdlc/Kbuild +++ b/trunk/include/linux/hdlc/Kbuild @@ -1 +0,0 @@ -header-y += ioctl.h diff --git a/trunk/include/uapi/linux/hdlc/Kbuild b/trunk/include/uapi/linux/hdlc/Kbuild index aafaa5aa54d4..8c1d2cb75e33 100644 --- a/trunk/include/uapi/linux/hdlc/Kbuild +++ b/trunk/include/uapi/linux/hdlc/Kbuild @@ -1 +1,2 @@ # UAPI Header export list +header-y += ioctl.h diff --git a/trunk/include/linux/hdlc/ioctl.h b/trunk/include/uapi/linux/hdlc/ioctl.h similarity index 98% rename from trunk/include/linux/hdlc/ioctl.h rename to trunk/include/uapi/linux/hdlc/ioctl.h index 583972364357..46939b24d612 100644 --- a/trunk/include/linux/hdlc/ioctl.h +++ b/trunk/include/uapi/linux/hdlc/ioctl.h @@ -34,13 +34,13 @@ #define LMI_CCITT 3 /* ITU-T Annex A */ #define LMI_CISCO 4 /* The "original" LMI, aka Gang of Four */ -typedef struct { +typedef struct { unsigned int clock_rate; /* bits per second */ unsigned int clock_type; /* internal, external, TX-internal etc. */ unsigned short loopback; } sync_serial_settings; /* V.35, V.24, X.21 */ -typedef struct { +typedef struct { unsigned int clock_rate; /* bits per second */ unsigned int clock_type; /* internal, external, TX-internal etc. */ unsigned short loopback;