Import newax25-2.4.3.patch.1.bz2HEADnewax25-2.4.3-1

And cleanup the *.orig and *.rej files and whitespace errors that are part
of the original patch.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 7 insertions, 8 deletions

diff --git a/net/ax25/Makefile b/net/ax25/Makefile
index 5974031f4..c35f59105 100644
--- a/net/ax25/Makefile
+++ b/net/ax25/Makefile
@@ -6,20 +6,19 @@
 # unless it's something special (ie not a .c file).
 #
 # Note 2! The CFLAGS definition is now in the main makefile...
-
+#
 
 O_TARGET := ax25.o
 
 export-objs := af_ax25.o
 
-obj-y	 := ax25_addr.o ax25_dev.o ax25_iface.o ax25_in.o ax25_ip.o ax25_out.o \
-	    ax25_route.o ax25_std_in.o ax25_std_subr.o ax25_std_timer.o \
-	    ax25_subr.o ax25_timer.o ax25_uid.o af_ax25.o
-
-obj-m    := $(O_TARGET)
+obj-y	:=  af_ax25.o ax25_in.o ax25_out.o ax25_route.o ax25_subr.o ax25_timer.o \
+	    ax25_vj.o ax25_ddi.o ax25_uid.o ax25_ctl.o ax25_core.o \
+	    ax25_ipax.o ax25_lapb.o ax25_netlink.o sysctl_net_ax25.o
 
-obj-$(CONFIG_AX25_DAMA_SLAVE) += ax25_ds_in.o ax25_ds_subr.o ax25_ds_timer.o
-obj-$(CONFIG_SYSCTL) += sysctl_net_ax25.o
+obj-m	:= $(O_TARGET)
 
 include $(TOPDIR)/Rules.make
 
+tar:
+		tar -cvf /dev/f1 .