diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-16 23:11:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-16 23:11:43 +0200 |
| commit | 2e57572a50a4de41c6cbc879a4866a312d4cd316 (patch) | |
| tree | c4f58ec96c06642c4b415b881d3f0a3b673d5b44 /arch/blackfin/include/asm/auxvec.h | |
| parent | sparc32: Use PROM device probing for sun4m timer registers. (diff) | |
| parent | sparc64: Fix OOPS in psycho_pcierr_intr_other(). (diff) | |
| download | linux-2e57572a50a4de41c6cbc879a4866a312d4cd316.tar.xz linux-2e57572a50a4de41c6cbc879a4866a312d4cd316.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts:
arch/sparc64/kernel/pci_psycho.c
Diffstat (limited to 'arch/blackfin/include/asm/auxvec.h')
| -rw-r--r-- | arch/blackfin/include/asm/auxvec.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/auxvec.h b/arch/blackfin/include/asm/auxvec.h new file mode 100644 index 000000000000..215506cd87b7 --- /dev/null +++ b/arch/blackfin/include/asm/auxvec.h @@ -0,0 +1,4 @@ +#ifndef __ASMBFIN_AUXVEC_H +#define __ASMBFIN_AUXVEC_H + +#endif |