diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-08-16 06:32:24 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-16 06:32:24 +0200 |
| commit | bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301 (patch) | |
| tree | 071fa9f86dc04a16570be367d04cff3b00c694ad /arch/parisc/include/asm/Kbuild | |
| parent | sh: Use __GFP_ZERO for dma_generic_alloc_coherent(). (diff) | |
| parent | Linux 2.6.36-rc1 (diff) | |
| download | linux-bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301.tar.xz linux-bbcf6e8b66ab2fb5ddab4d0fe40c2e6a5ebe5301.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/include/asm/Kbuild
drivers/Makefile
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/parisc/include/asm/Kbuild')
| -rw-r--r-- | arch/parisc/include/asm/Kbuild | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild index f88b252e419c..19a434f55059 100644 --- a/arch/parisc/include/asm/Kbuild +++ b/arch/parisc/include/asm/Kbuild @@ -1,3 +1,3 @@ include include/asm-generic/Kbuild.asm -unifdef-y += pdc.h +header-y += pdc.h |