Merge branches 'release', 'ejd', 'sony' and 'wmi' into release

[linux-2.6-omap-h63xx.git] / include / asm-m68knommu / dma.h

diff --git a/include/asm-m68knommu/dma.h b/include/asm-m68knommu/dma.h
index 43e98c96a5c255b1cf2c07759f328526c3892075..3f20419c633aab478da5b587acbc10de2416aaeb 100644 (file)
--- a/include/asm-m68knommu/dma.h
+++ b/include/asm-m68knommu/dma.h
@@ -3,7 +3,6 @@
  
 //#define      DMA_DEBUG       1
 
-#include <linux/config.h>
 
 #ifdef CONFIG_COLDFIRE
 /*
@@ -40,6 +39,8 @@
 #define MAX_M68K_DMA_CHANNELS 4
 #elif defined(CONFIG_M5272)
 #define MAX_M68K_DMA_CHANNELS 1
+#elif defined(CONFIG_M532x)
+#define MAX_M68K_DMA_CHANNELS 0
 #else
 #define MAX_M68K_DMA_CHANNELS 2
 #endif