Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
[linux-2.6-microblaze.git] / arch / arm / boot / dts / s5pv210-aquila.dts
index 8e57e5a..6423348 100644 (file)
                        <&keypad_col0>, <&keypad_col1>, <&keypad_col2>;
        status = "okay";
 
-       key_1 {
+       key-1 {
                keypad,row = <0>;
                keypad,column = <1>;
                linux,code = <KEY_CONNECT>;
        };
 
-       key_2 {
+       key-2 {
                keypad,row = <0>;
                keypad,column = <2>;
                linux,code = <KEY_BACK>;
        };
 
-       key_3 {
+       key-3 {
                keypad,row = <1>;
                keypad,column = <1>;
                linux,code = <KEY_CAMERA_FOCUS>;
        };
 
-       key_4 {
+       key-4 {
                keypad,row = <1>;
                keypad,column = <2>;
                linux,code = <KEY_VOLUMEUP>;
        };
 
-       key_5 {
+       key-5 {
                keypad,row = <2>;
                keypad,column = <1>;
                linux,code = <KEY_CAMERA>;
        };
 
-       key_6 {
+       key-6 {
                keypad,row = <2>;
                keypad,column = <2>;
                linux,code = <KEY_VOLUMEDOWN>;