--- linux-3.0.6/arch/arm/tools/mach-types.orig	2011-10-04 15:11:59.000000000 +0100
+++ linux-3.0.6/arch/arm/tools/mach-types	2011-10-04 15:13:23.000000000 +0100
@@ -445,7 +445,6 @@
 mx23evk			MACH_MX23EVK		MX23EVK			2629
 ap4evb			MACH_AP4EVB		AP4EVB			2630
 mityomapl138		MACH_MITYOMAPL138	MITYOMAPL138		2650
-guruplug		MACH_GURUPLUG		GURUPLUG		2659
 spear310		MACH_SPEAR310		SPEAR310		2660
 spear320		MACH_SPEAR320		SPEAR320		2661
 aquila			MACH_AQUILA		AQUILA			2676
@@ -1113,3 +1112,5 @@
 thales_adc		MACH_THALES_ADC		THALES_ADC		3492
 ubisys_p9d_evp		MACH_UBISYS_P9D_EVP	UBISYS_P9D_EVP		3493
 atdgp318		MACH_ATDGP318		ATDGP318		3494
+dreamplug		MACH_DREAMPLUG		DREAMPLUG		2659
+guruplug		MACH_GURUPLUG		GURUPLUG		3550