Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / arch / arm / boot / dts / gemini-wbd111.dts

diff --git a/arch/arm/boot/dts/gemini-wbd111.dts b/arch/arm/boot/dts/gemini-wbd111.dts
index 29af86c..3a2761d 100644 (file)
--- a/arch/arm/boot/dts/gemini-wbd111.dts
+++ b/arch/arm/boot/dts/gemini-wbd111.dts
@@ -29,7 +29,7 @@
                compatible = "gpio-keys";
 
                button-setup {
-                       debounce-interval = <50>;
+                       debounce-interval = <100>;
                        wakeup-source;
                        linux,code = <KEY_SETUP>;
                        label = "reset";
@@ -171,5 +171,13 @@
                                /* Not used in this platform */
                        };
                };
+
+               usb@68000000 {
+                       status = "okay";
+               };
+
+               usb@69000000 {
+                       status = "okay";
+               };
        };
 };