diff options
| author | Linus Torvalds | 2006-07-01 18:58:43 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-07-01 18:58:43 +0200 |
| commit | b4bc7b53ccfa0cb793591ba11af49db8f1bc5a4d (patch) | |
| tree | bb0d32d8c8a9d558794dbda60542beace0d2bcbc /arch | |
| parent | [PATCH] pnp: suppress request_irq() warning (diff) | |
| parent | kbuild: documentation change on allowing checkers besides sparse (diff) | |
| download | kernel-qcow2-linux-b4bc7b53ccfa0cb793591ba11af49db8f1bc5a4d.tar.gz kernel-qcow2-linux-b4bc7b53ccfa0cb793591ba11af49db8f1bc5a4d.tar.xz kernel-qcow2-linux-b4bc7b53ccfa0cb793591ba11af49db8f1bc5a4d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild:
kbuild: documentation change on allowing checkers besides sparse
kbuild: warn when a moduled uses a symbol marked UNUSED
kbuild: fix segv in modpost
kconfig: enhancing accessibility of lxdialog
kbuild: fix ia64 breakage after introducing make -rR
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/scripts/Makefile.rules | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/scripts/Makefile.rules b/arch/um/scripts/Makefile.rules index 1347dc6d5218..813077fb1e5b 100644 --- a/arch/um/scripts/Makefile.rules +++ b/arch/um/scripts/Makefile.rules @@ -8,7 +8,7 @@ USER_OBJS += $(filter %_user.o,$(obj-y) $(obj-m) $(USER_SINGLE_OBJS)) USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file)) $(USER_OBJS:.o=.%): \ - c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) $(CFLAGS_$(*F).o) + c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) $(CFLAGS_$(basetarget).o) $(USER_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \ -Dunix -D__unix__ -D__$(SUBARCH)__ @@ -17,7 +17,7 @@ $(USER_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \ UNPROFILE_OBJS := $(foreach file,$(UNPROFILE_OBJS),$(obj)/$(file)) $(UNPROFILE_OBJS:.o=.%): \ - c_flags = -Wp,-MD,$(depfile) $(call unprofile,$(USER_CFLAGS)) $(CFLAGS_$(*F).o) + c_flags = -Wp,-MD,$(depfile) $(call unprofile,$(USER_CFLAGS)) $(CFLAGS_$(basetarget).o) $(UNPROFILE_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \ -Dunix -D__unix__ -D__$(SUBARCH)__ |