Merge commit 'jwb/merge' into merge

git-mirror · Jul 8, 2009 · 01cc826 · 01cc826
2 parents faf80d6 + a22ebd0
commit 01cc826
Show file tree

Hide file tree

Showing 3 changed files with 166 additions and 56 deletions.
diff --git a/arch/powerpc/boot/dts/warp.dts b/arch/powerpc/boot/dts/warp.dts
@@ -261,10 +261,11 @@
 				compatible = "gpio-leds";
 				green {
 					gpios = <&GPIO1 0 0>;
-					default-state = "on";
+					default-state = "keep";
 				};
 				red {
 					gpios = <&GPIO1 1 0>;
+					default-state = "keep";
 				};
 			};