diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-08 11:52:42 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-08 11:52:42 -0400 |
| commit | 88c3cdfdde3cf87e1831265ea4246430bef34fc9 (patch) | |
| tree | caea510ffb2f81a5ea13b00ecb8a4146ad462048 /arch/um/Makefile-i386 | |
| parent | 2b2c3750330325ae5071582b5c4dbdf1c8bc1e51 (diff) | |
| parent | a92b7b80579fe68fe229892815c750f6652eb6a9 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/um/Makefile-i386')
| -rw-r--r-- | arch/um/Makefile-i386 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386 index 29e182d5a83a..301059062a3e 100644 --- a/arch/um/Makefile-i386 +++ b/arch/um/Makefile-i386 | |||
| @@ -8,7 +8,7 @@ ifeq ($(CONFIG_MODE_SKAS),y) | |||
| 8 | endif | 8 | endif |
| 9 | endif | 9 | endif |
| 10 | 10 | ||
| 11 | CFLAGS += -U__$(SUBARCH)__ -U$(SUBARCH) | 11 | CFLAGS += -U__$(SUBARCH)__ -U$(SUBARCH) $(STUB_CFLAGS) |
| 12 | ARCH_USER_CFLAGS := | 12 | ARCH_USER_CFLAGS := |
| 13 | 13 | ||
| 14 | ifneq ($(CONFIG_GPROF),y) | 14 | ifneq ($(CONFIG_GPROF),y) |