Imported Upstream version 4.4.0.122

Former-commit-id: a99f46acaeba3ab496c7afc02c29b839e30a0d0b

mcs/class/corlib/System/Console.cs

@@ -96,11 +96,6 @@ namespace System
 
 		static Console ()
 		{
-#if NET_2_1
-			Encoding inputEncoding;
-			Encoding outputEncoding;
-#endif
-
 			if (Environment.IsRunningOnWindows) {
 				//
 				// On Windows, follow the Windows tradition
@@ -540,7 +535,6 @@ namespace System
 
 #endif
 
-#if !NET_2_1
 		// FIXME: Console should use these encodings when changed
 		static Encoding inputEncoding;
 		static Encoding outputEncoding;
@@ -561,6 +555,7 @@ namespace System
 			}
 		}
 
+#if !NET_2_1
 		public static ConsoleColor BackgroundColor {
 			get { return ConsoleDriver.BackgroundColor; }
 			set { ConsoleDriver.BackgroundColor = value; }