From bc2f0dd44d556077853f5da922f02efa9b36ba7b Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 11 Dec 2008 14:50:39 +0000 Subject: [PATCH] --- yaml --- r: 137165 b: refs/heads/master c: 8c56afcbea22e472d3bfa8ddf06f23cd6bc56826 h: refs/heads/master i: 137163: 2a931c10d87a446645658206a731e5d238665783 v: v3 --- [refs] | 2 +- trunk/arch/arm/include/asm/mach/dma.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index aaf99c526ab9..9d1aa90a1371 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad9dd94c384f7ee37b798a9349b8c42da8fa99ab +refs/heads/master: 8c56afcbea22e472d3bfa8ddf06f23cd6bc56826 diff --git a/trunk/arch/arm/include/asm/mach/dma.h b/trunk/arch/arm/include/asm/mach/dma.h index 4326738ff36f..3122adae80be 100644 --- a/trunk/arch/arm/include/asm/mach/dma.h +++ b/trunk/arch/arm/include/asm/mach/dma.h @@ -21,7 +21,7 @@ struct dma_ops { void (*disable)(unsigned int, dma_t *); /* mandatory */ int (*residue)(unsigned int, dma_t *); /* optional */ int (*setspeed)(unsigned int, dma_t *, int); /* optional */ - char *type; + const char *type; }; struct dma_struct { @@ -40,7 +40,7 @@ struct dma_struct { unsigned int lock; /* Device is allocated */ const char *device_id; /* Device name */ - struct dma_ops *d_ops; + const struct dma_ops *d_ops; }; struct floppy_dma {