Title: [5765] trunk/arch/blackfin: Apply patch[#4622] except for const in struct dma_channel
- Revision
- 5765
- Author
- sonicz
- Date
- 2008-12-01 01:36:00 -0600 (Mon, 01 Dec 2008)
Log Message
Apply patch[#4622] except for const in struct dma_channel
Modified Paths
Diff
Modified: trunk/arch/blackfin/include/asm/dma.h (5764 => 5765)
--- trunk/arch/blackfin/include/asm/dma.h 2008-12-01 04:26:10 UTC (rev 5764)
+++ trunk/arch/blackfin/include/asm/dma.h 2008-12-01 07:36:00 UTC (rev 5765)
@@ -191,7 +191,7 @@
int dma_channel_active(unsigned int channel); /* check if a channel is in use */
void disable_dma(unsigned int channel);
void enable_dma(unsigned int channel);
-int request_dma(unsigned int channel, char *device_id);
+int request_dma(unsigned int channel, const char *device_id);
int set_dma_callback(unsigned int channel, dma_interrupt_t callback,
void *data);
void dma_disable_irq(unsigned int channel);
Modified: trunk/arch/blackfin/kernel/bfin_dma_5xx.c (5764 => 5765)
--- trunk/arch/blackfin/kernel/bfin_dma_5xx.c 2008-12-01 04:26:10 UTC (rev 5764)
+++ trunk/arch/blackfin/kernel/bfin_dma_5xx.c 2008-12-01 07:36:00 UTC (rev 5765)
@@ -116,7 +116,7 @@
/*------------------------------------------------------------------------------
* Request the specific DMA channel from the system.
*-----------------------------------------------------------------------------*/
-int request_dma(unsigned int channel, char *device_id)
+int request_dma(unsigned int channel, const char *device_id)
{
pr_debug("request_dma() : BEGIN \n");
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
