summaryrefslogtreecommitdiffstats
path: root/drivers/net/wan
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 /drivers/net/wan
parentd77807230e1ef30dbdee85aa24d27073a14dd168 (diff)
downloadblackbird-op-linux-c48c8d51c29efba160a1b27555d97f6ee0d049a6.tar.gz
blackbird-op-linux-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 'drivers/net/wan')
-rw-r--r--drivers/net/wan/Makefile2
-rw-r--r--drivers/net/wan/wanxlfw.S1
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wan/Makefile b/drivers/net/wan/Makefile
index 4dac96b3db2a..b0a61636fc94 100644
--- a/drivers/net/wan/Makefile
+++ b/drivers/net/wan/Makefile
@@ -52,7 +52,7 @@ endif
quiet_cmd_build_wanxlfw = BLD FW $@
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; \
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
diff --git a/drivers/net/wan/wanxlfw.S b/drivers/net/wan/wanxlfw.S
index 73aae2bf2f1c..21565d59ec7b 100644
--- a/drivers/net/wan/wanxlfw.S
+++ b/drivers/net/wan/wanxlfw.S
@@ -35,6 +35,7 @@
*/
#include <linux/hdlc.h>
+#include <linux/hdlc/ioctl.h>
#include "wanxl.h"
/* memory addresses and offsets */
OpenPOWER on IntegriCloud