diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 17:06:24 +0100 | 
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-11-15 17:06:24 +0100 | 
| commit | 9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1 (patch) | |
| tree | d8c434ea98ee541ee17f4df87bb8e9020ce29b98 /drivers/media/platform/omap3isp/isphist.c | |
| parent | 49ea7fc094162fcaa83f5876b2090c816cc4498c (diff) | |
| parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff) | |
| download | olio-linux-3.10-9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1.tar.xz olio-linux-3.10-9265c6a186ca19a57ab6ddd0b0f3644f85c6f2f1.zip  | |
Merge branch 'omap/headers4' into next/cleanup
Diffstat (limited to 'drivers/media/platform/omap3isp/isphist.c')
| -rw-r--r-- | drivers/media/platform/omap3isp/isphist.c | 2 | 
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/platform/omap3isp/isphist.c b/drivers/media/platform/omap3isp/isphist.c index d1a8dee5e1c..e7f9c4292cc 100644 --- a/drivers/media/platform/omap3isp/isphist.c +++ b/drivers/media/platform/omap3isp/isphist.c @@ -34,6 +34,8 @@  #include "ispreg.h"  #include "isphist.h" +#define OMAP24XX_DMA_NO_DEVICE		0 +  #define HIST_CONFIG_DMA	1  #define HIST_USING_DMA(hist) ((hist)->dma_ch >= 0)  |