git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
HID: add dynids facility
[safe/jmp/linux-2.6]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
b3d1c8f
..
f900666
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,7
@@
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 28
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 28
-EXTRAVERSION =
-rc7
+EXTRAVERSION =
NAME = Erotic Pickled Herring
# *DOCUMENTATION*
NAME = Erotic Pickled Herring
# *DOCUMENTATION*
@@
-205,13
+205,14
@@
ifeq ($(ARCH),x86_64)
SRCARCH := x86
endif
SRCARCH := x86
endif
-#
Where to locate arch specific headers
+#
Additional ARCH settings for sparc
ifeq ($(ARCH),sparc64)
ifeq ($(ARCH),sparc64)
- hdr-arch := sparc
-else
- hdr-arch := $(SRCARCH)
+ SRCARCH := sparc
endif
endif
+# Where to locate arch specific headers
+hdr-arch := $(SRCARCH)
+
KCONFIG_CONFIG ?= .config
# SHELL used by kbuild
KCONFIG_CONFIG ?= .config
# SHELL used by kbuild
@@
-320,7
+321,8
@@
KALLSYMS = scripts/kallsyms
PERL = perl
CHECK = sparse
PERL = perl
CHECK = sparse
-CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ -Wbitwise $(CF)
+CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
+ -Wbitwise -Wno-return-void $(CF)
MODFLAGS = -DMODULE
CFLAGS_MODULE = $(MODFLAGS)
AFLAGS_MODULE = $(MODFLAGS)
MODFLAGS = -DMODULE
CFLAGS_MODULE = $(MODFLAGS)
AFLAGS_MODULE = $(MODFLAGS)