diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2010-03-18 22:35:28 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2010-03-18 22:35:28 -0400 |
| commit | 5286944d75cbe21dd21b0d57335cc6206622b62a (patch) | |
| tree | 2e881f338a075bf303e13641ad1ca3fb6fc42658 | |
| parent | 7f2d889c9cdcd33e8942a23765623adbd468cf04 (diff) | |
alpha: fix compile errors in dma-mapping-common.h
The commit c186caca3dbe7f44da624cb4f9d78e1b1dfb13b8 leads to the
following errors with CONFIG_ALPHA_{TSUNAMI, TITAN, RAWHIDE, MARVEL}:
/home/fujita/git/linux-2.6/include/asm-generic/dma-mapping-common.h: In
function `dma_map_sg_attrs':
/home/fujita/git/linux-2.6/include/asm-generic/dma-mapping-common.h:49:
error: implicit declaration of function `for_each_sg'
/home/fujita/git/linux-2.6/include/asm-generic/dma-mapping-common.h:50:
error: syntax error before "kmemcheck_mark_initialized"
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Reported-by: Michael Cree <mcree@orcon.net.nz>
Signed-off-by: Matt Turner <mattst88@gmail.com>
| -rw-r--r-- | arch/alpha/include/asm/core_marvel.h | 1 | ||||
| -rw-r--r-- | arch/alpha/include/asm/core_mcpcia.h | 1 | ||||
| -rw-r--r-- | arch/alpha/include/asm/core_titan.h | 1 | ||||
| -rw-r--r-- | arch/alpha/include/asm/core_tsunami.h | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/arch/alpha/include/asm/core_marvel.h b/arch/alpha/include/asm/core_marvel.h index 30d55fe7aaf6..dad300fa14ce 100644 --- a/arch/alpha/include/asm/core_marvel.h +++ b/arch/alpha/include/asm/core_marvel.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #define __ALPHA_MARVEL__H__ | 12 | #define __ALPHA_MARVEL__H__ |
| 13 | 13 | ||
| 14 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 15 | #include <linux/pci.h> | ||
| 16 | #include <linux/spinlock.h> | 15 | #include <linux/spinlock.h> |
| 17 | 16 | ||
| 18 | #include <asm/compiler.h> | 17 | #include <asm/compiler.h> |
diff --git a/arch/alpha/include/asm/core_mcpcia.h b/arch/alpha/include/asm/core_mcpcia.h index acf55b483472..21ac53383b37 100644 --- a/arch/alpha/include/asm/core_mcpcia.h +++ b/arch/alpha/include/asm/core_mcpcia.h | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #define MCPCIA_ONE_HAE_WINDOW 1 | 6 | #define MCPCIA_ONE_HAE_WINDOW 1 |
| 7 | 7 | ||
| 8 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 9 | #include <linux/pci.h> | ||
| 10 | #include <asm/compiler.h> | 9 | #include <asm/compiler.h> |
| 11 | 10 | ||
| 12 | /* | 11 | /* |
diff --git a/arch/alpha/include/asm/core_titan.h b/arch/alpha/include/asm/core_titan.h index a17f6f33b68e..8cf79d1219e1 100644 --- a/arch/alpha/include/asm/core_titan.h +++ b/arch/alpha/include/asm/core_titan.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define __ALPHA_TITAN__H__ | 2 | #define __ALPHA_TITAN__H__ |
| 3 | 3 | ||
| 4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 5 | #include <linux/pci.h> | ||
| 6 | #include <asm/compiler.h> | 5 | #include <asm/compiler.h> |
| 7 | 6 | ||
| 8 | /* | 7 | /* |
diff --git a/arch/alpha/include/asm/core_tsunami.h b/arch/alpha/include/asm/core_tsunami.h index 58d4fe48742c..8e39ecf09419 100644 --- a/arch/alpha/include/asm/core_tsunami.h +++ b/arch/alpha/include/asm/core_tsunami.h | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #define __ALPHA_TSUNAMI__H__ | 2 | #define __ALPHA_TSUNAMI__H__ |
| 3 | 3 | ||
| 4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 5 | #include <linux/pci.h> | ||
| 6 | #include <asm/compiler.h> | 5 | #include <asm/compiler.h> |
| 7 | 6 | ||
| 8 | /* | 7 | /* |