Merge branch 'afs-proc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / arch / arm / boot / dts / at91-sama5d4ek.dts

diff --git a/arch/arm/boot/dts/at91-sama5d4ek.dts b/arch/arm/boot/dts/at91-sama5d4ek.dts
index 7887a71..0702a2f 100644 (file)
--- a/arch/arm/boot/dts/at91-sama5d4ek.dts
+++ b/arch/arm/boot/dts/at91-sama5d4ek.dts
@@ -129,8 +129,8 @@
                                        wakeup-source;
                                };
 
-                               atmel_mxt_ts@4c {
-                                       compatible = "atmel,atmel_mxt_ts";
+                               touchscreen@4c {
+                                       compatible = "atmel,maxtouch";
                                        reg = <0x4c>;
                                        interrupt-parent = <&pioE>;
                                        interrupts = <24 0x0>;