From: Johannes Berg <johannes@sipsolutions.net>
Date: Thu, 29 Jan 2009 13:46:55 +0000 (+0100)
Subject: Merge branch 'master' into scan-test
X-Git-Tag: v0.9.10~13
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84bee8120fe389dc4587ef4bcd778c3e62b29cc4;p=thirdparty%2Fiw.git

Merge branch 'master' into scan-test

Conflicts:
	Makefile
---

84bee8120fe389dc4587ef4bcd778c3e62b29cc4
diff --cc Makefile
index cc87d6b,4de66e8..7954cd6
--- a/Makefile
+++ b/Makefile
@@@ -13,7 -13,7 +13,7 @@@ CC ?= "gcc
  CFLAGS ?= -O2 -g
  CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration
  
- OBJS = iw.o info.o phy.o interface.o station.o util.o mpath.o reg.o mesh.o genl.o scan.o
 -OBJS = iw.o genl.o info.o phy.o interface.o station.o util.o mesh.o mpath.o reg.o
++OBJS = iw.o genl.o info.o phy.o interface.o station.o util.o mesh.o mpath.o scan.o reg.o
  ALL = iw
  
  NL1FOUND := $(shell pkg-config --atleast-version=1 libnl-1 && echo Y)