diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-10-20 17:07:19 +0200 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-20 17:07:19 +0200 |
| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /include/asm-m68k/dma.h | |
| parent | uwb: wrong sizeof argument in mac address compare (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 (diff) | |
| download | linux-61e0e79ee3c609eb34edf2fe023708cba6a79b1f.tar.xz linux-61e0e79ee3c609eb34edf2fe023708cba6a79b1f.zip | |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
Diffstat (limited to 'include/asm-m68k/dma.h')
| -rw-r--r-- | include/asm-m68k/dma.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-m68k/dma.h b/include/asm-m68k/dma.h index d0c9e61e57b4..4240fbc946f8 100644 --- a/include/asm-m68k/dma.h +++ b/include/asm-m68k/dma.h @@ -11,10 +11,6 @@ extern int request_dma(unsigned int dmanr, const char * device_id); /* reserve a DMA channel */ extern void free_dma(unsigned int dmanr); /* release it again */ -#ifdef CONFIG_PCI -extern int isa_dma_bridge_buggy; -#else #define isa_dma_bridge_buggy (0) -#endif #endif /* _M68K_DMA_H */ |