From: Alexander Aring Date: Tue, 28 Oct 2014 17:21:16 +0000 (+0100) Subject: mac802154: monitor: merge into iface implementation X-Git-Tag: omap-for-v3.20/drop-legacy-3517~122^2~234^2~3^2~38 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9ff77e50c6e469db63dfc8fcc62586522649cd3;p=pandora-kernel.git mac802154: monitor: merge into iface implementation This patch removes the monitor implementation file and put all monitor stuff into iface file. It's now small enough to put all necessary handling into iface. Signed-off-by: Alexander Aring Signed-off-by: Marcel Holtmann --- diff --git a/net/mac802154/Makefile b/net/mac802154/Makefile index e68debaf2a59..2e497d0c829a 100644 --- a/net/mac802154/Makefile +++ b/net/mac802154/Makefile @@ -1,5 +1,5 @@ obj-$(CONFIG_MAC802154) += mac802154.o mac802154-objs := main.o rx.o tx.o mac_cmd.o mib.o \ - monitor.o iface.o llsec.o util.o + iface.o llsec.o util.o ccflags-y += -D__CHECK_ENDIAN__ Reading git-diff-tree failed