diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 06:52:04 +0200 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-21 06:52:04 +0200 |
commit | a02efb906d12c9d4eb2ab7c59049ba9545e5412d (patch) | |
tree | bf1f6467978ec63a22f42299ecac2ee7f7e73336 /arch/parisc/include/asm/auxvec.h | |
parent | Merge commit 'kumar/kumar-for-2.6.28' (diff) | |
parent | binfmt_elf_fdpic: Update for cputime changes. (diff) | |
download | linux-a02efb906d12c9d4eb2ab7c59049ba9545e5412d.tar.xz linux-a02efb906d12c9d4eb2ab7c59049ba9545e5412d.zip |
Merge commit 'origin' into master
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/include/asm/page.h
Diffstat (limited to 'arch/parisc/include/asm/auxvec.h')
-rw-r--r-- | arch/parisc/include/asm/auxvec.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/parisc/include/asm/auxvec.h b/arch/parisc/include/asm/auxvec.h new file mode 100644 index 000000000000..9c3ac4b89dc9 --- /dev/null +++ b/arch/parisc/include/asm/auxvec.h @@ -0,0 +1,4 @@ +#ifndef __ASMPARISC_AUXVEC_H +#define __ASMPARISC_AUXVEC_H + +#endif |