diff --git a/[refs] b/[refs]
index c589457226b2..ef5969facc0b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b23f204c8dbbed8e501442c47d7639aac21a3d84
+refs/heads/master: 550ec36f507177470a394c4dfffcaf986ca25818
diff --git a/trunk/drivers/dma/amba-pl08x.c b/trunk/drivers/dma/amba-pl08x.c
index 94949909e4e9..775efef0349c 100644
--- a/trunk/drivers/dma/amba-pl08x.c
+++ b/trunk/drivers/dma/amba-pl08x.c
@@ -237,7 +237,7 @@ struct pl08x_dma_chan {
 	struct pl08x_phy_chan *phychan;
 	int phychan_hold;
 	struct tasklet_struct tasklet;
-	char *name;
+	const char *name;
 	const struct pl08x_channel_data *cd;
 	dma_addr_t src_addr;
 	dma_addr_t dst_addr;
diff --git a/trunk/include/linux/amba/pl08x.h b/trunk/include/linux/amba/pl08x.h
index 48d02bf66ec9..158ce2634b01 100644
--- a/trunk/include/linux/amba/pl08x.h
+++ b/trunk/include/linux/amba/pl08x.h
@@ -58,7 +58,7 @@ enum {
  * these buses (use PL08X_AHB1 | PL08X_AHB2).
  */
 struct pl08x_channel_data {
-	char *bus_id;
+	const char *bus_id;
 	int min_signal;
 	int max_signal;
 	u32 muxval;