diff --git a/[refs] b/[refs]
index 556f3468993c..dd05fd45b2f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a65a69d493c589f4225dc26c19598c00c1de0b4
+refs/heads/master: 138712218e7582e274990cdf77dc798b2aa4fa99
diff --git a/trunk/arch/avr32/Kconfig b/trunk/arch/avr32/Kconfig
index bbecbd8469b5..4f402c924504 100644
--- a/trunk/arch/avr32/Kconfig
+++ b/trunk/arch/avr32/Kconfig
@@ -19,9 +19,6 @@ config AVR32
 	  There is an AVR32 Linux project with a web page at
 	  http://avr32linux.org/.
 
-config UID16
-	bool
-
 config GENERIC_GPIO
 	bool
 	default y