diff --git a/[refs] b/[refs]
index 76b33dcfbcef..7015442dc65c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18c5332bc17e75efdc02cc17410c647a627861f2
+refs/heads/master: ea6526605a60cf9a6f758605f73062fac6d974cf
diff --git a/trunk/arch/powerpc/kernel/setup-common.c b/trunk/arch/powerpc/kernel/setup-common.c
index aa743a50a20a..1292460fcde2 100644
--- a/trunk/arch/powerpc/kernel/setup-common.c
+++ b/trunk/arch/powerpc/kernel/setup-common.c
@@ -361,7 +361,6 @@ static int __init set_preferred_console(void)
 
  		if (reg && compat && (strcmp(compat, "hvterm-protocol") == 0)) {
  			/* Host Virtual Serial Interface */
- 			int offset;
  			switch (reg[0]) {
  				case 0x30000000:
  					offset = 0;