summaryrefslogtreecommitdiffstats
path: root/include/uapi/linux/hdlc
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2012-11-07 02:37:24 +0000
committerDavid S. Miller <davem@davemloft.net>2012-11-09 16:28:37 -0500
commitc48c8d51c29efba160a1b27555d97f6ee0d049a6 (patch)
tree9ca7974ddca9a91bc300ff46d6058818c362ce59 /include/uapi/linux/hdlc
parentd77807230e1ef30dbdee85aa24d27073a14dd168 (diff)
downloadlinux-stable-c48c8d51c29efba160a1b27555d97f6ee0d049a6.tar.gz
linux-stable-c48c8d51c29efba160a1b27555d97f6ee0d049a6.tar.bz2
linux-stable-c48c8d51c29efba160a1b27555d97f6ee0d049a6.zip
Fix the wanxl firmware to include missing constants
Fix the wanxl firmware to include missing constants such as PARITY_NONE. It should be #including the linux/hdlc/ioctl.h header. To make this work, we also have to guard parts of ioctl.h with !__ASSEMBLY__. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux/hdlc')
-rw-r--r--include/uapi/linux/hdlc/ioctl.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/uapi/linux/hdlc/ioctl.h b/include/uapi/linux/hdlc/ioctl.h
index 46939b24d612..04bc0274a189 100644
--- a/include/uapi/linux/hdlc/ioctl.h
+++ b/include/uapi/linux/hdlc/ioctl.h
@@ -34,6 +34,8 @@
#define LMI_CCITT 3 /* ITU-T Annex A */
#define LMI_CISCO 4 /* The "original" LMI, aka Gang of Four */
+#ifndef __ASSEMBLY__
+
typedef struct {
unsigned int clock_rate; /* bits per second */
unsigned int clock_type; /* internal, external, TX-internal etc. */
@@ -78,4 +80,5 @@ typedef struct {
/* PPP doesn't need any info now - supply length = 0 to ioctl */
+#endif /* __ASSEMBLY__ */
#endif /* __HDLC_IOCTL_H__ */