Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[linux-2.6-microblaze.git] / arch / arm / boot / dts / exynos4210-i9100.dts

diff --git a/arch/arm/boot/dts/exynos4210-i9100.dts b/arch/arm/boot/dts/exynos4210-i9100.dts
index 5370ee4..a0c3bab 100644 (file)
--- a/arch/arm/boot/dts/exynos4210-i9100.dts
+++ b/arch/arm/boot/dts/exynos4210-i9100.dts
@@ -329,7 +329,7 @@
        pinctrl-0 = <&i2c3_bus>;
        pinctrl-names = "default";
 
-       mxt224-touchscreen@4a {
+       touchscreen@4a {
                compatible = "atmel,maxtouch";
                reg = <0x4a>;
 
@@ -348,7 +348,7 @@
        pinctrl-0 = <&i2c5_bus>;
        pinctrl-names = "default";
 
-       max8997_pmic@66 {
+       pmic@66 {
                compatible = "maxim,max8997-pmic";
                reg = <0x66>;
 
@@ -597,7 +597,7 @@
        pinctrl-0 = <&i2c7_bus>;
        pinctrl-names = "default";
 
-       ak8975@c {
+       magnetometer@c {
                compatible = "asahi-kasei,ak8975";
                reg = <0x0c>;