diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-05 02:59:32 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-05 02:59:32 +0400 |
| commit | d5e4cc8faf91bb408fdf2767f73dcfee35e193da (patch) | |
| tree | 44cd8594c67531235d33e4d65394e36d839f1839 /arch/um/scripts/Makefile.rules | |
| parent | 7253b85cc62d6ff84143d96fe6cd54f73736f4d7 (diff) | |
| parent | a0d271cbfed1dd50278c6b06bead3d00ba0a88f9 (diff) | |
| download | linux-d5e4cc8faf91bb408fdf2767f73dcfee35e193da.tar.xz | |
Merge commit 'v3.6' into fixes
Diffstat (limited to 'arch/um/scripts/Makefile.rules')
| -rw-r--r-- | arch/um/scripts/Makefile.rules | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/scripts/Makefile.rules b/arch/um/scripts/Makefile.rules index d50270d26b42..15889df9b466 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) -include user.h $(CFLAGS_$(basetarget).o) + c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) -include $(srctree)/include/linux/kern_levels.h -include user.h $(CFLAGS_$(basetarget).o) # These are like USER_OBJS but filter USER_CFLAGS through unprofile instead of # using it directly. |