diff --git a/[refs] b/[refs]
index 6a0134a278e6..671f804d75f4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e5b5d0209f0d01cdb11ab7f7af4ab9f48d0b3031
+refs/heads/master: c1411bfae63286fbe6e63a1ec558eb4eb812859c
diff --git a/trunk/include/linux/atmel_tc.h b/trunk/include/linux/atmel_tc.h
index 1d14b1dc1aee..89a931babecf 100644
--- a/trunk/include/linux/atmel_tc.h
+++ b/trunk/include/linux/atmel_tc.h
@@ -63,7 +63,7 @@ struct atmel_tc {
 	struct platform_device	*pdev;
 	struct resource		*iomem;
 	void __iomem		*regs;
-	struct atmel_tcb_config	*tcb_config;
+	const struct atmel_tcb_config *tcb_config;
 	int			irq[3];
 	struct clk		*clk[3];
 	struct list_head	node;