aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-08-01 06:23:57 -0400
committerDavid Woodhouse <dwmw2@infradead.org>2007-08-01 06:23:57 -0400
commit440fdb53b4ae58602711b5b8c3a139ace2404dbb (patch)
treec6fb88d6ad537ec53aeecadc75a61ab6147d4c9c /Makefile
parent8b2b403ce0f1a816b7a6a4f47c8798003b26c07a (diff)
parent8d4fbcfbe0a4bfc73e7f0297c59ae514e1f1436f (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 23f81c9f698e..dfe3d1610a7b 100644
--- a/Makefile
+++ b/Makefile
@@ -299,7 +299,7 @@ CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise $(C
299MODFLAGS = -DMODULE 299MODFLAGS = -DMODULE
300CFLAGS_MODULE = $(MODFLAGS) 300CFLAGS_MODULE = $(MODFLAGS)
301AFLAGS_MODULE = $(MODFLAGS) 301AFLAGS_MODULE = $(MODFLAGS)
302LDFLAGS_MODULE = -r 302LDFLAGS_MODULE =
303CFLAGS_KERNEL = 303CFLAGS_KERNEL =
304AFLAGS_KERNEL = 304AFLAGS_KERNEL =
305 305