diff options
| author |   James Morris <jmorris@namei.org> | 2010-01-18 09:56:22 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-01-18 09:56:22 +1100 |
| commit | 2457552d1e6f3183cd93f81c49a8da5fe8bb0e42 (patch) | |
| tree | 7ca46caa910012d75617700e4083b3657053cb31 /arch/powerpc/kernel/dma-swiotlb.c | |
| parent | selinux: change the handling of unknown classes (diff) | |
| parent | page allocator: update NR_FREE_PAGES only when necessary (diff) | |
| download | linux-dev-2457552d1e6f3183cd93f81c49a8da5fe8bb0e42.tar.xz linux-dev-2457552d1e6f3183cd93f81c49a8da5fe8bb0e42.zip | |
Merge branch 'master' into next
Diffstat (limited to 'arch/powerpc/kernel/dma-swiotlb.c')
| -rw-r--r-- | arch/powerpc/kernel/dma-swiotlb.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/dma-swiotlb.c b/arch/powerpc/kernel/dma-swiotlb.c index e96cbbd9b449..59c928564a03 100644 --- a/arch/powerpc/kernel/dma-swiotlb.c +++ b/arch/powerpc/kernel/dma-swiotlb.c @@ -21,7 +21,6 @@ #include <asm/dma.h> #include <asm/abs_addr.h> -int swiotlb __read_mostly; unsigned int ppc_swiotlb_enable; /* |