diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 16:13:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 16:13:16 -0400 |
| commit | d20ead9e86881bc7ae84e385f47b5196b7d93aac (patch) | |
| tree | ed27dd5db5f8447e4b3f541f0ec38219085d2f32 /Makefile | |
| parent | c56ec7639288f3e5d6371b0c48d37da93642fc93 (diff) | |
| parent | 88e4d250234fc9e64d6ce51df95efdcf8334fd95 (diff) | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86
* ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-x86: (114 commits)
x86: delete vsyscall files during make clean
kbuild: fix typo SRCARCH in find_sources
x86: fix kernel rebuild due to vsyscall fallout
.gitignore update for x86 arch
x86: unify include/asm/debugreg_32/64.h
x86: unify include/asm/unwind_32/64.h
x86: unify include/asm/types_32/64.h
x86: unify include/asm/tlb_32/64.h
x86: unify include/asm/siginfo_32/64.h
x86: unify include/asm/bug_32/64.h
x86: unify include/asm/mman_32/64.h
x86: unify include/asm/agp_32/64.h
x86: unify include/asm/kdebug_32/64.h
x86: unify include/asm/ioctls_32/64.h
x86: unify include/asm/floppy_32/64.h
x86: apply missing DMA/OOM prevention to floppy_32.h
x86: unify include/asm/cache_32/64.h
x86: unify include/asm/cache_32/64.h
x86: unify include/asm/dmi_32/64.h
x86: unify include/asm/delay_32/64.h
...
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
| @@ -1325,8 +1325,8 @@ ALLSOURCE_ARCHS := $(ARCH) $(SRCARCH) | |||
| 1325 | endif | 1325 | endif |
| 1326 | 1326 | ||
| 1327 | define find-sources | 1327 | define find-sources |
| 1328 | ( for ARCH in $(ALLSOURCE_ARCHS) ; do \ | 1328 | ( for arch in $(ALLSOURCE_ARCHS) ; do \ |
| 1329 | find $(__srctree)arch/$${SRCARCH} $(RCS_FIND_IGNORE) \ | 1329 | find $(__srctree)arch/$${arch} $(RCS_FIND_IGNORE) \ |
| 1330 | -name $1 -print; \ | 1330 | -name $1 -print; \ |
| 1331 | done ; \ | 1331 | done ; \ |
| 1332 | find $(__srctree)security/selinux/include $(RCS_FIND_IGNORE) \ | 1332 | find $(__srctree)security/selinux/include $(RCS_FIND_IGNORE) \ |
| @@ -1334,8 +1334,8 @@ define find-sources | |||
| 1334 | find $(__srctree)include $(RCS_FIND_IGNORE) \ | 1334 | find $(__srctree)include $(RCS_FIND_IGNORE) \ |
| 1335 | \( -name config -o -name 'asm-*' \) -prune \ | 1335 | \( -name config -o -name 'asm-*' \) -prune \ |
| 1336 | -o -name $1 -print; \ | 1336 | -o -name $1 -print; \ |
| 1337 | for ARCH in $(ALLINCLUDE_ARCHS) ; do \ | 1337 | for arch in $(ALLINCLUDE_ARCHS) ; do \ |
| 1338 | find $(__srctree)include/asm-$${SRCARCH} $(RCS_FIND_IGNORE) \ | 1338 | find $(__srctree)include/asm-$${arch} $(RCS_FIND_IGNORE) \ |
| 1339 | -name $1 -print; \ | 1339 | -name $1 -print; \ |
| 1340 | done ; \ | 1340 | done ; \ |
| 1341 | find $(__srctree)include/asm-generic $(RCS_FIND_IGNORE) \ | 1341 | find $(__srctree)include/asm-generic $(RCS_FIND_IGNORE) \ |