diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-10 11:54:10 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-10 11:54:13 +1100 |
| commit | f4a9c8025965d2775740b04cf1bce63975cc21d0 (patch) | |
| tree | 18fef5a66c5521911c28760d52529ee2d46cd9e0 /arch/um | |
| parent | d632182d59df0c29220622c03ab9c57f8a93a843 (diff) | |
| parent | e1cf87b2db1ebf2c96ca71f52db94ffadc4742c5 (diff) | |
Merge remote branch 'kbuild/for-next'
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/Makefile | 2 | ||||
| -rw-r--r-- | arch/um/include/asm/asm-offsets.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index fc633dbacf84..fab8121d2b32 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -149,6 +149,6 @@ $(SHARED_HEADERS)/user_constants.h: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s $(SHARED_HEADERS)/kern_constants.h: $(Q)mkdir -p $(dir $@) - $(Q)echo '#include "../../../../include/asm/asm-offsets.h"' >$@ + $(Q)echo '#include "../../../../include/generated/asm-offsets.h"' >$@ export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH DEV_NULL_PATH diff --git a/arch/um/include/asm/asm-offsets.h b/arch/um/include/asm/asm-offsets.h new file mode 100644 index 000000000000..d370ee36a182 --- /dev/null +++ b/arch/um/include/asm/asm-offsets.h @@ -0,0 +1 @@ +#include <generated/asm-offsets.h> |