Commit c48c8d51 authored by David Howells's avatar David Howells Committed by David S. Miller

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: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d7780723
...@@ -52,7 +52,7 @@ endif ...@@ -52,7 +52,7 @@ endif
quiet_cmd_build_wanxlfw = BLD FW $@ quiet_cmd_build_wanxlfw = BLD FW $@
cmd_build_wanxlfw = \ cmd_build_wanxlfw = \
$(CPP) -Wp,-MD,$(depfile) -I$(srctree)/include/uapi $< | $(AS68K) -m68360 -o $(obj)/wanxlfw.o; \ $(CPP) -D__ASSEMBLY__ -Wp,-MD,$(depfile) -I$(srctree)/include/uapi $< | $(AS68K) -m68360 -o $(obj)/wanxlfw.o; \
$(LD68K) --oformat binary -Ttext 0x1000 $(obj)/wanxlfw.o -o $(obj)/wanxlfw.bin; \ $(LD68K) --oformat binary -Ttext 0x1000 $(obj)/wanxlfw.o -o $(obj)/wanxlfw.bin; \
hexdump -ve '"\n" 16/1 "0x%02X,"' $(obj)/wanxlfw.bin | sed 's/0x ,//g;1s/^/static u8 firmware[]={/;$$s/,$$/\n};\n/' >$(obj)/wanxlfw.inc; \ hexdump -ve '"\n" 16/1 "0x%02X,"' $(obj)/wanxlfw.bin | sed 's/0x ,//g;1s/^/static u8 firmware[]={/;$$s/,$$/\n};\n/' >$(obj)/wanxlfw.inc; \
rm -f $(obj)/wanxlfw.bin $(obj)/wanxlfw.o rm -f $(obj)/wanxlfw.bin $(obj)/wanxlfw.o
......
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
*/ */
#include <linux/hdlc.h> #include <linux/hdlc.h>
#include <linux/hdlc/ioctl.h>
#include "wanxl.h" #include "wanxl.h"
/* memory addresses and offsets */ /* memory addresses and offsets */
......
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
#define LMI_CCITT 3 /* ITU-T Annex A */ #define LMI_CCITT 3 /* ITU-T Annex A */
#define LMI_CISCO 4 /* The "original" LMI, aka Gang of Four */ #define LMI_CISCO 4 /* The "original" LMI, aka Gang of Four */
#ifndef __ASSEMBLY__
typedef struct { typedef struct {
unsigned int clock_rate; /* bits per second */ unsigned int clock_rate; /* bits per second */
unsigned int clock_type; /* internal, external, TX-internal etc. */ unsigned int clock_type; /* internal, external, TX-internal etc. */
...@@ -78,4 +80,5 @@ typedef struct { ...@@ -78,4 +80,5 @@ typedef struct {
/* PPP doesn't need any info now - supply length = 0 to ioctl */ /* PPP doesn't need any info now - supply length = 0 to ioctl */
#endif /* __ASSEMBLY__ */
#endif /* __HDLC_IOCTL_H__ */ #endif /* __HDLC_IOCTL_H__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment