diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index fbe5eef1..52ba9cdf 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -4,8 +4,12 @@
 # create a compressed vmlinuz image from the original vmlinux
 #
 
+AFLAGS_head.o := -Wa,-march=armv6k
 HEAD	= head.o
-OBJS	= misc.o
+AFLAGS_misc.o +=-Wa,-march=armv6k
+MISC = misc.o
+AFLAGS_piggy.o +=-Wa,-march=armv6k
+PIGGY = piggy.o
 FONTC	= $(srctree)/drivers/video/console/font_acorn_8x8.c
 
 #
@@ -91,7 +95,7 @@ LDFLAGS_vmlinux += -p --no-undefined -X \
 # would otherwise mess up our GOT table
 CFLAGS_misc.o := -Dstatic=
 
-$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.o \
+$(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/$(MISC) $(obj)/$(PIGGY) \
 	 	$(addprefix $(obj)/, $(OBJS)) FORCE
 	$(call if_changed,ld)
 	@:
@@ -99,6 +103,7 @@ $(obj)/vmlinux: $(obj)/vmlinux.lds $(obj)/$(HEAD) $(obj)/piggy.o \
 $(obj)/piggy.gz: $(obj)/../Image FORCE
 	$(call if_changed,gzip)
 
+AFLAGS_piggy.$(suffix_y).o += -Wa,-march=armv6k
 $(obj)/piggy.o:  $(obj)/piggy.gz FORCE
 
 CFLAGS_font.o := -Dstatic=
diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
index e29a5ec0..ca5467c7 100644
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
@@ -201,8 +201,6 @@ struct xt_action_param {
 		const void *matchinfo, *targinfo;
 	};
 	const struct net_device *in, *out;
-	const struct xt_match *match;
-	const void *matchinfo;
 	int fragoff;
 	unsigned int thoff;
 	unsigned int hooknum;
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index 24247f76..698252f6 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -221,7 +221,6 @@ struct snd_soc_dai {
 
 	/* parent codec/platform */
 	union {
-		struct snd_soc_codec *codec;
 		struct snd_soc_platform *platform;
 	};
 
diff --git a/vendor_ti_wlan/ap/stad/build/linux/common.inc b/vendor_ti_wlan/ap/stad/build/linux/common.inc
index f0fbc371..e276849a 100644
--- a/vendor_ti_wlan/ap/stad/build/linux/common.inc
+++ b/vendor_ti_wlan/ap/stad/build/linux/common.inc
@@ -202,7 +202,7 @@ endif
 ##
 ##
 
-EXTRA_CFLAGS += -fsigned-char -Werror
+EXTRA_CFLAGS += -fsigned-char
 EXTRA_CFLAGS += -D __LINUX__
 EXTRA_CFLAGS += $(DK_DEFINES)
 EXTRA_CFLAGS += $(PFORM_DEFINES)
diff --git a/vendor_ti_wlan/sta/stad/build/linux/common.inc b/vendor_ti_wlan/sta/stad/build/linux/common.inc
index c67823ef..a5a37242 100644
--- a/vendor_ti_wlan/sta/stad/build/linux/common.inc
+++ b/vendor_ti_wlan/sta/stad/build/linux/common.inc
@@ -177,7 +177,7 @@ endif
 ##
 ##
 
-EXTRA_CFLAGS += -fsigned-char -Werror
+EXTRA_CFLAGS += -fsigned-char
 EXTRA_CFLAGS += -D __LINUX__
 EXTRA_CFLAGS += $(DK_DEFINES)
 EXTRA_CFLAGS += $(PFORM_DEFINES)