ccwmx51: Fix compilation issues after applying Freescale patches

The mach-mx51 folder has been replaced by mach-mx5 to enable the addition
of more platforms.

Signed-off-by: Alejandro Gonzalez <alex.gonzalez@digi.com>

32 files changed, 298 insertions, 37914 deletions

diff --git a/arch/arm/mach-mx28/Kconfig b/arch/arm/mach-mx28/Kconfig
index 7ea1a91f4023..fdca0f6900ca 100644
--- a/arch/arm/mach-mx28/Kconfig
+++ b/arch/arm/mach-mx28/Kconfig
@@ -7,7 +7,6 @@ config MACH_MX28EVK
 	select USB_ARCH_HAS_EHCI
 
 config MXS_TIMER_WITH_MACH
-	bool
-	default y
+	bool "Timer with architecture."
 
 endchoice
diff --git a/arch/arm/mach-mx5/Kconfig b/arch/arm/mach-mx5/Kconfig
index 5c07a3a5d2b6..cd6a985af260 100644
--- a/arch/arm/mach-mx5/Kconfig
+++ b/arch/arm/mach-mx5/Kconfig
@@ -1,10 +1,10 @@
 if ARCH_MX5
 
 config ARCH_MX51
-	bool
+	bool "MX51"
 
 config ARCH_MX53
-	bool
+	bool "MX53"
 
 config FORCE_MAX_ZONEORDER
     int "MAX_ORDER"
@@ -44,6 +44,25 @@ config MACH_MX53_EVK
 	  Include support for MX53 EVK platform. This includes specific
 	  configurations for the board and its peripherals.
 
+config MODULE_CCXMX51
+	bool
+
+config MACH_CCWMX51JS
+	bool "Support for the ConnectCore Wi-i.MX51 module, on the JSK base board"
+	select MODULE_CCXMX51
+	help
+	  Include support for the Digi ConnectCore Wi-i.MX51 Embedded Module, on the
+	  JumpStart Kit base board. This includes specific configurations for the
+	  peripherals on that base board.
+
+config MACH_CCWMX51
+	bool "Support for the ConnectCore Wi-i.MX51 module"
+	select MODULE_CCXMX51
+	help
+	  Include support for the Digi ConnectCore Wi-i.MX51 Embedded Module, on a
+	  custom board. The machine file should be modified to include support for
+	  the interfaces available in that board.
+
 comment "MX5x Options:"
 
 config MXC_SDMA_API
@@ -76,3 +95,58 @@ config SDMA_IRAM
 	  Support Internal RAM as SDMA buffer or control structures
 
 endif
+
+menu "Serial Port Options"
+config UART1_ENABLED
+	bool "Enable UART1"
+	default y
+	depends on SERIAL_MXC && MACH_CCWMX51JS
+	help
+	  Enable the MX51 UART1 interface
+
+config UART2_ENABLED
+	bool "Enable UART2"
+	default y
+	depends on SERIAL_MXC && MACH_CCWMX51JS
+	help
+	  Enable the MX51 UART2 interface
+
+config UART3_ENABLED
+	bool "Enable UART3"
+	default y
+	depends on SERIAL_MXC && MACH_CCWMX51JS
+	help
+	  Enable the MX51 UART3 interface
+endmenu
+
+menu "SPI Interface Options"
+config SPI_MXC_SELECT1
+	bool "Enable CSPI1"
+	depends on SPI_MXC && MACH_CCWMX51JS
+	default y
+	help
+	  Enable the CSPI1 interface
+
+config SPI_MXC_SELECT1_SS1
+	bool "Enable SS1 line for CSPI1"
+	depends on SPI_MXC_SELECT1 && MACH_CCWMX51JS
+	default y
+	help
+          Enable SS1 (slave select 1) line, used on ConnectCore Wi-i.MX51 base board SPI connector
+
+config SPI_MXC_SELECT2
+	bool "Enable CSPI2"
+	depends on SPI_MXC && MACH_CCWMX51JS
+	default n
+	help
+	  Enable the CSPI2 interface
+
+config SPI_MXC_SELECT3
+	bool "Enable CSPI3"
+	depends on SPI_MXC && MACH_CCWMX51JS
+	default n
+	help
+	  Enable the CSPI3 interface
+endmenu
+
+source "arch/arm/mach-mx5/displays/Kconfig"
\ No newline at end of file
diff --git a/arch/arm/mach-mx5/Makefile b/arch/arm/mach-mx5/Makefile
index cbf2137fd938..a04f5017b6d0 100644
--- a/arch/arm/mach-mx5/Makefile
+++ b/arch/arm/mach-mx5/Makefile
@@ -11,4 +11,5 @@ sdram_autogating.o bus_freq.o usb_dr.o usb_h1.o usb_h2.o dummy_gpio.o wfi.o susp
 obj-$(CONFIG_MACH_MX51_3DS) += mx51_3stack.o mx51_3stack_gpio.o mx51_3stack_pmic_mc13892.o
 obj-$(CONFIG_MACH_MX51_BABBAGE) += mx51_babbage.o mx51_babbage_gpio.o mx51_babbage_pmic_mc13892.o
 obj-$(CONFIG_MACH_MX53_EVK) += mx53_evk.o mx53_evk_gpio.o mx53_evk_pmic_mc13892.o
-
+obj-$(CONFIG_MACH_CCWMX51JS) += mx51_ccwmx51js.o mx51_ccwmx51js_gpio.o
+obj-$(CONFIG_MXC_PMIC_MC13892) +=  mx51_ccwmx51js_pmic_mc13892.o
diff --git a/arch/arm/mach-mx51/board-ccwmx51.h b/arch/arm/mach-mx5/board-ccwmx51.h
index 6696c27c5c36..6696c27c5c36 100644
--- a/arch/arm/mach-mx51/board-ccwmx51.h
+++ b/arch/arm/mach-mx5/board-ccwmx51.h
diff --git a/arch/arm/mach-mx5/devices.c b/arch/arm/mach-mx5/devices.c
index df433a8f5417..143ba48d2b2c 100644
--- a/arch/arm/mach-mx5/devices.c
+++ b/arch/arm/mach-mx5/devices.c
@@ -258,6 +258,13 @@ struct platform_device mxc_fb_devices[] = {
 	},
 };
 
+struct platform_device lcd_pdev = {
+        .name = "ccwmx51_display",
+        .dev = {
+                .coherent_dma_mask = DMA_BIT_MASK(32),
+        },
+};
+
 static struct resource vpu_resources[] = {
 	{
 		.start = VPU_BASE_ADDR,
@@ -610,6 +617,70 @@ struct mxc_gpio_port mxc_gpio_ports[] = {
 	},
 };
 
+#if defined(CONFIG_SMSC9118) || defined(CONFIG_SMSC9118_MODULE)
+static struct resource smsc911x_device_resources[] = {
+	{
+		.name	= "smsc911x-memory",
+		.start	= CS5_BASE_ADDR,
+		.end	= CS5_BASE_ADDR + SZ_4K - 1,
+		.flags	= IORESOURCE_MEM,
+	},
+	{
+		.start	= IOMUX_TO_IRQ(MX51_PIN_GPIO1_9),
+		.end	= IOMUX_TO_IRQ(MX51_PIN_GPIO1_9),
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+static struct platform_device smsc911x_device = {
+        .name             = "smsc911x",
+        .id               = -1,
+        .num_resources    = ARRAY_SIZE(smsc911x_device_resources),
+        .resource         = smsc911x_device_resources,
+};
+
+/* WEIM registers */
+#define CSGCR1	0x00
+#define CSGCR2	0x04
+#define CSRCR1	0x08
+#define CSRCR2	0x0C
+#define CSWCR1	0x10
+
+static void ccwmx51_init_ext_eth_mac(void)
+{
+	__iomem u32 *weim_vbaddr;
+
+	weim_vbaddr = ioremap(WEIM_BASE_ADDR, SZ_4K);
+	if (weim_vbaddr == 0) {
+		printk(KERN_ERR "Unable to ioremap 0x%08x in %s\n", WEIM_BASE_ADDR, __func__);
+		return;
+	}
+
+	/** Configure the CS timming, bus width, etc.
+	 * 16 bit on DATA[31..16], not multiplexed, async
+	 * RWSC=50, RADVA=2, RADVN=6, OEA=0, OEN=0, RCSA=0, RCSN=0, APR=0
+	 * WAL=0, WBED=1, WWSC=50, WADVA=2, WADVN=6, WEA=0, WEN=0, WCSA=0
+	 */
+	writel(0x00420081, (unsigned int)(weim_vbaddr) + 0x78 + CSGCR1);
+	writel(0, (unsigned int)(weim_vbaddr) + 0x78 + CSGCR2);
+	writel(0x32260000, (unsigned int)(weim_vbaddr) + 0x78 + CSRCR1);
+	writel(0, (unsigned int)(weim_vbaddr) + 0x78 + CSRCR2);
+	writel(0x72080f00, (unsigned int)(weim_vbaddr) + 0x78 + CSWCR1);
+
+	iounmap(weim_vbaddr);
+
+	/* Configure interrupt line as GPIO input, the iomux should be already setup */
+	gpio_request(IOMUX_TO_GPIO(MX51_PIN_GPIO1_9), "LAN2-irq");
+	gpio_direction_input(IOMUX_TO_GPIO(MX51_PIN_GPIO1_9));
+}
+#endif
+
+#if defined(CONFIG_SND_SOC_IMX_CCWMX51_WM8753) || defined(CONFIG_SND_SOC_IMX_CCWMX51_WM8753_MODULE)
+struct platform_device mxc_wm8753_device = {
+	.name = "ccwmx51js",
+};
+#endif
+
 int __init mxc_register_gpios(void)
 {
 	if (cpu_is_mx51())
@@ -1346,6 +1417,9 @@ int __init mxc_init_devices(void)
 
 	mxc_init_scc_iram();
 	mxc_init_gpu2d();
+#if defined(CONFIG_SMSC9118) || defined(CONFIG_SMSC9118_MODULE)
+	ccwmx51_init_ext_eth_mac();
+#endif
 	return 0;
 }
 postcore_initcall(mxc_init_devices);
diff --git a/arch/arm/mach-mx5/devices.h b/arch/arm/mach-mx5/devices.h
index d3467faf90e1..e5effff9cedc 100644
--- a/arch/arm/mach-mx5/devices.h
+++ b/arch/arm/mach-mx5/devices.h
@@ -59,4 +59,5 @@ extern struct platform_device mxc_usbdr_otg_device;
 extern struct platform_device mxc_usbdr_host_device;
 extern struct platform_device mxc_usbh1_device;
 extern struct platform_device mxc_usbh2_device;
-
+extern struct platform_device lcd_pdev;
+extern struct platform_device mxc_wm8753_device;
diff --git a/arch/arm/mach-mx51/displays/CUSTOM.h b/arch/arm/mach-mx5/displays/CUSTOM.h
index 19759533d84e..19759533d84e 100644
--- a/arch/arm/mach-mx51/displays/CUSTOM.h
+++ b/arch/arm/mach-mx5/displays/CUSTOM.h
diff --git a/arch/arm/mach-mx51/displays/Kconfig b/arch/arm/mach-mx5/displays/Kconfig
index 347f21cafd64..674a6651bcca 100644
--- a/arch/arm/mach-mx51/displays/Kconfig
+++ b/arch/arm/mach-mx5/displays/Kconfig
@@ -3,7 +3,7 @@
 # Copyright 2010 Digi International, Inc
 #
 
-if FB_MXC_SYNC_PANEL
+if FB_MXC_SYNC_PANEL && MACH_CCWMX51JS
 
 comment "Display selection"
 
diff --git a/arch/arm/mach-mx51/displays/LQ070Y3DG3B.h b/arch/arm/mach-mx5/displays/LQ070Y3DG3B.h
index 8cf33b65fd6b..8cf33b65fd6b 100644
--- a/arch/arm/mach-mx51/displays/LQ070Y3DG3B.h
+++ b/arch/arm/mach-mx5/displays/LQ070Y3DG3B.h
diff --git a/arch/arm/mach-mx51/displays/display-ccwmx51.h b/arch/arm/mach-mx5/displays/display-ccwmx51.h
index b1e875c9694f..b1e875c9694f 100644
--- a/arch/arm/mach-mx51/displays/display-ccwmx51.h
+++ b/arch/arm/mach-mx5/displays/display-ccwmx51.h
diff --git a/arch/arm/mach-mx51/displays/displays.h b/arch/arm/mach-mx5/displays/displays.h
index 1fa2c1d05b5d..1fa2c1d05b5d 100644
--- a/arch/arm/mach-mx51/displays/displays.h
+++ b/arch/arm/mach-mx5/displays/displays.h
diff --git a/arch/arm/mach-mx5/dummy_gpio.c b/arch/arm/mach-mx5/dummy_gpio.c
index 8d9537d31026..8eb771d29a06 100644
--- a/arch/arm/mach-mx5/dummy_gpio.c
+++ b/arch/arm/mach-mx5/dummy_gpio.c
@@ -14,12 +14,6 @@
 #include <linux/errno.h>
 #include <linux/module.h>
 
-void gpio_uart_active(int port, int no_irda) {}
-EXPORT_SYMBOL(gpio_uart_active);
-
-void gpio_uart_inactive(int port, int no_irda) {}
-EXPORT_SYMBOL(gpio_uart_inactive);
-
 void gpio_gps_active(void) {}
 EXPORT_SYMBOL(gpio_gps_active);
 
diff --git a/arch/arm/mach-mx51/mx51_ccwmx51js.c b/arch/arm/mach-mx5/mx51_ccwmx51js.c
index 453261160cd9..91ccc1dc81f5 100644
--- a/arch/arm/mach-mx51/mx51_ccwmx51js.c
+++ b/arch/arm/mach-mx5/mx51_ccwmx51js.c
@@ -44,11 +44,12 @@
 #include <mach/gpio.h>
 #include <mach/mmc.h>
 #include <mach/mxc_dvfs.h>
-#include "board.h"
+#include "board-ccwmx51.h"
 #include "iomux.h"
 #include "crm_regs.h"
 #include "devices.h"
-
+#include "mx51_pins.h"
+#include "displays/displays.h"
 #include <linux/smc911x.h>
 
 #if defined(CONFIG_MTD) || defined(CONFIG_MTD_MODULE)
@@ -195,6 +196,14 @@ static struct mxc_mmc_platform_data mmc3_data = {
 };
 #endif
 
+#if defined(CONFIG_FB_MXC_SYNC_PANEL) || defined(CONFIG_FB_MXC_SYNC_PANEL_MODULE)
+static struct resource mxcfb_resources[] = {
+	[0] = {
+	       .flags = IORESOURCE_MEM,
+	       },
+};
+#endif
+
 /*!
  * Board specific fixup function. It is called by \b setup_arch() in
  * setup.c file very early on during kernel starts. It allows the user to
@@ -210,32 +219,73 @@ static void __init fixup_mxc_board(struct machine_desc *desc, struct tag *tags,
 				   char **cmdline, struct meminfo *mi)
 {
 	char *str;
-	int size = SZ_512M - SZ_32M;
 	struct tag *t;
+	struct tag *mem_tag = 0;
+	int total_mem = SZ_512M;
+	int left_mem = 0;
+	int gpu_mem = SZ_64M;
+	int fb_mem = SZ_32M;
 
-	mxc_cpu_init();
+	mxc_set_cpu_type(MXC_CPU_MX51);
 
 	get_cpu_wp = mx51_get_cpu_wp;
 	set_num_cpu_wp = mx51_set_num_cpu_wp;
 
-	for_each_tag(t, tags) {
-		if (t->hdr.tag != ATAG_CMDLINE)
-			continue;
-		str = t->u.cmdline.cmdline;
-		str = strstr(str, "mem=");
-		if (str != NULL) {
-			str += 4;
-			size = memparse(str, &str);
-			if (size == 0 || size == SZ_512M)
-				return;
+	for_each_tag(mem_tag, tags) {
+		if (mem_tag->hdr.tag == ATAG_MEM) {
+			total_mem = mem_tag->u.mem.size;
+			left_mem = total_mem - gpu_mem - fb_mem;
+			break;
 		}
 	}
 
 	for_each_tag(t, tags) {
-		if (t->hdr.tag != ATAG_MEM)
-			continue;
+		if (t->hdr.tag == ATAG_CMDLINE) {
+			str = t->u.cmdline.cmdline;
+			str = strstr(str, "mem=");
+			if (str != NULL) {
+				str += 4;
+				left_mem = memparse(str, &str);
+				if (left_mem == 0 || left_mem > total_mem)
+					left_mem = total_mem - gpu_mem - fb_mem;
+			}
+
+			str = t->u.cmdline.cmdline;
+			str = strstr(str, "gpu_memory=");
+			if (str != NULL) {
+				str += 11;
+				gpu_mem = memparse(str, &str);
+			}
+
+			break;
+		}
+	}
 
-		t->u.mem.size = size;
+	if (mem_tag) {
+		fb_mem = total_mem - left_mem - gpu_mem;
+		if (fb_mem < 0) {
+			gpu_mem = total_mem - left_mem;
+			fb_mem = 0;
+		}
+		mem_tag->u.mem.size = left_mem;
+
+		/*reserve memory for gpu*/
+		gpu_device.resource[5].start =
+				mem_tag->u.mem.start + left_mem;
+		gpu_device.resource[5].end =
+				gpu_device.resource[5].start + gpu_mem - 1;
+#if defined(CONFIG_FB_MXC_SYNC_PANEL) || \
+	defined(CONFIG_FB_MXC_SYNC_PANEL_MODULE)
+		if (fb_mem) {
+			mxcfb_resources[0].start =
+				gpu_device.resource[5].end + 1;
+			mxcfb_resources[0].end =
+				mxcfb_resources[0].start + fb_mem - 1;
+		} else {
+			mxcfb_resources[0].start = 0;
+			mxcfb_resources[0].end = 0;
+		}
+#endif
 	}
 }
 
@@ -424,8 +474,65 @@ static struct uio_info gpu2d_platform_data = {
 };
 #endif
 
+#if defined(CONFIG_FB_MXC_SYNC_PANEL) || defined(CONFIG_FB_MXC_SYNC_PANEL_MODULE)
 struct ccwmx51_lcd_pdata * plcd_platform_data;
 
+struct ccwmx51_lcd_pdata * ccwmx51_get_display(char *name)
+{
+#if defined(CONFIG_CCWMX51_LQ070Y3DG3B) || defined(CONFIG_CCWMX51_CUSTOM)
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(lcd_display_list); i++)
+		if (!strncmp(lcd_display_list[i].fb_pdata.mode->name,
+			     name, strlen(lcd_display_list[i].fb_pdata.mode->name)))
+			return &lcd_display_list[i];
+#endif
+	return NULL;
+}
+
+static int __init ccwmx51_init_fb(void)
+{
+	char *options = NULL, *p;
+
+	if (fb_get_options("displayfb", &options))
+		pr_warning("no display information available in command line\n");
+
+	if (!options)
+		return -ENODEV;
+
+	if (!strncasecmp(options, "VGA", 3)) {
+		pr_info("VGA interface is primary\n");
+
+		/* Get the desired configuration provided by the bootloader */
+		if (options[3] != '@') {
+			pr_info("Video resolution for VGA interface not provided, using default\n");
+			/* TODO set default video here */
+		} else {
+			options = &options[4];
+			if (((p = strsep (&options, "@")) != NULL) && *p) {
+				if (!strcmp(p, "640x480x16")) {
+					strcpy(mx51_fb_data[0].mode_str, "640x480M-16@60");
+				} else if (!strcmp(p, "800x600x16")) {
+					strcpy(mx51_fb_data[0].mode_str, "800x600M-16@60");
+				} else if (!strcmp(p, "1024x768x16")) {
+					strcpy(mx51_fb_data[0].mode_str, "1024x768M-16@60");
+				} else if (!strcmp(p, "1280x1024x16")) {
+					strcpy(mx51_fb_data[0].mode_str, "1280x1024M-16@60");
+				} else
+					pr_warning("Unsuported video resolution: %s, using default\n", p);
+			}
+		}
+	} else {
+		if ((plcd_platform_data = ccwmx51_get_display(options)) != NULL) {
+			memcpy(&mx51_fb_data[0], &plcd_platform_data->fb_pdata, sizeof(struct mxc_fb_platform_data));
+			plcd_platform_data->vif = 0;	/* Select video interface 0 */
+		}
+	}
+	return 0;
+}
+device_initcall(ccwmx51_init_fb);
+#endif
+
 /*!
  * Board specific initialization.
  */
@@ -441,7 +548,6 @@ static void __init mxc_board_init(void)
 	mxc_cpu_common_init();
 	mxc_register_gpios();
 	ccwmx51_io_init();
-	early_console_setup(saved_command_line);
 
 	mxc_register_device(&mxc_wdt_device, NULL);
 	mxc_register_device(&mxcspi1_device, &mxcspi1_data);
@@ -504,6 +610,8 @@ static void __init mxc_board_init(void)
 	ccwmx51_init_i2c2();
 #if defined(CONFIG_FB_MXC_SYNC_PANEL) || defined(CONFIG_FB_MXC_SYNC_PANEL_MODULE)
 	mxc_register_device(&lcd_pdev, plcd_platform_data);
+	mxc_fb_devices[0].num_resources = ARRAY_SIZE(mxcfb_resources);
+	mxc_fb_devices[0].resource = mxcfb_resources;
 	mxc_register_device(&mxc_fb_devices[0], &mx51_fb_data[0]);
 //	mxc_register_device(&mxc_fb_devices[1], &mx51_fb_data[1]);
 //	mxc_register_device(&mxc_fb_devices[2], NULL);
@@ -520,6 +628,8 @@ static void __init mxc_board_init(void)
 
 static void __init ccwmx51_timer_init(void)
 {
+	struct clk *uart_clk;
+
 	/* Change the CPU voltages for TO2*/
 	if (cpu_is_mx51_rev(CHIP_REV_2_0) <= 1) {
 		cpu_wp_auto[0].cpu_voltage = 1175000;
@@ -528,6 +638,9 @@ static void __init ccwmx51_timer_init(void)
 	}
 
 	mx51_clocks_init(32768, 24000000, 22579200, 24576000);
+
+	uart_clk = clk_get(NULL, "uart_clk.1");
+	early_console_setup(UART2_BASE_ADDR, uart_clk);
 }
 
 static struct sys_timer mxc_timer = {
@@ -540,8 +653,8 @@ MACHINE_START(CCWMX51JS, "ConnectCore Wi-i.MX51 on a JSK board")
 	.io_pg_offst = ((AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
 	.boot_params = PHYS_OFFSET + 0x100,
 	.fixup = fixup_mxc_board,
-	.map_io = mx51_map_io,
-	.init_irq = mx51_init_irq,
+	.map_io = mx5_map_io,
+	.init_irq = mx5_init_irq,
 	.init_machine = mxc_board_init,
 	.timer = &mxc_timer,
 MACHINE_END
diff --git a/arch/arm/mach-mx51/mx51_ccwmx51js_gpio.c b/arch/arm/mach-mx5/mx51_ccwmx51js_gpio.c
index 336eba686881..7922347f4f3e 100644
--- a/arch/arm/mach-mx51/mx51_ccwmx51js_gpio.c
+++ b/arch/arm/mach-mx5/mx51_ccwmx51js_gpio.c
@@ -20,6 +20,7 @@
 #include <mach/gpio.h>
 
 #include "iomux.h"
+#include "mx51_pins.h"
 
 static void ccwmx51_mmc2_gpio_active(void);
 
@@ -380,7 +381,7 @@ static struct mxc_iomux_pin_cfg __initdata ccwmx51_iomux_devices_pins[] = {
 #if defined(CONFIG_SND_SOC_WM8753) || defined(CONFIG_SND_SOC_WM8753_MODULE)
 static struct mxc_iomux_pin_cfg __initdata ccwmx51_audio_pins[] = {
 
-	/* TODO: the SSI interface should be selectable through configuration */  
+	/* TODO: the SSI interface should be selectable through configuration */
 	{	/* AUD3_BB_CK */
 		MX51_PIN_AUD3_BB_CK, IOMUX_CONFIG_ALT0 ,
 		(PAD_CTL_SRE_FAST | PAD_CTL_DRV_HIGH | PAD_CTL_100K_PU |
@@ -543,11 +544,11 @@ void ccwmx51_gpio_spi_chipselect_inactive(int busnum, int ssb_pol,
 	case 1:
 		switch (chipselect) {
 		case 0x1:
-			gpio_set_value(IOMUX_TO_GPIO(MX51_PIN_CSPI1_SS0), 
+			gpio_set_value(IOMUX_TO_GPIO(MX51_PIN_CSPI1_SS0),
 				       (ssb_pol & mask) ?  0 : 1);
 			break;
 		case 0x2:
-			gpio_set_value(IOMUX_TO_GPIO(MX51_PIN_CSPI1_SS1), 
+			gpio_set_value(IOMUX_TO_GPIO(MX51_PIN_CSPI1_SS1),
 				       (ssb_pol & mask) ?  0 : 1);
 			break;
 		default:
diff --git a/arch/arm/mach-mx51/mx51_ccwmx51js_pmic_mc13892.c b/arch/arm/mach-mx5/mx51_ccwmx51js_pmic_mc13892.c
index fd45b159bcfc..88864efe3b56 100644
--- a/arch/arm/mach-mx51/mx51_ccwmx51js_pmic_mc13892.c
+++ b/arch/arm/mach-mx5/mx51_ccwmx51js_pmic_mc13892.c
@@ -22,6 +22,7 @@
 #include <linux/mfd/mc13892/core.h>
 #include "iomux.h"
 #include <mach/irqs.h>
+#include "mx51_pins.h"
 
 /*
  * Convenience conversion.
diff --git a/arch/arm/mach-mx5/usb_dr.c b/arch/arm/mach-mx5/usb_dr.c
index e72ec58cbf3a..658583b65ab6 100644
--- a/arch/arm/mach-mx5/usb_dr.c
+++ b/arch/arm/mach-mx5/usb_dr.c
@@ -20,6 +20,7 @@
 #include <mach/hardware.h>
 #include "usb.h"
 
+#if defined(CONFIG_USB_OTG) || defined(CONFIG_USB_EHCI_ARC_OTG) || defined(CONFIG_USB_GADGET_ARC)
 static int usbotg_init_ext(struct platform_device *pdev);
 static void usbotg_uninit_ext(struct fsl_usb2_platform_data *pdata);
 static void _wake_up_enable(struct fsl_usb2_platform_data *pdata, bool enable);
@@ -137,6 +138,7 @@ static void usbotg_clock_gate(bool on)
 		clk_put(usb_clk);
 	}
 }
+#endif
 
 void __init mx5_usb_dr_init(void)
 {
diff --git a/arch/arm/mach-mx51/Kconfig b/arch/arm/mach-mx51/Kconfig
deleted file mode 100644
index 034e11d50c03..000000000000
--- a/arch/arm/mach-mx51/Kconfig
+++ /dev/null
@@ -1,148 +0,0 @@
-menu "MX51 Options"
-	depends on ARCH_MX51
-
-config FORCE_MAX_ZONEORDER
-    int "MAX_ORDER"
-    default "13"
-
-config MX51_OPTIONS
-	bool
-	default y
-	select CPU_V7
-	select USB_ARCH_HAS_EHCI
-	select MXC_TZIC
-
-config MACH_MX51_3DS
-	bool "Support MX51 3-Stack platforms"
-	default y
-	help
-	  Include support for MX51 3-Stack platform. This includes specific
-	  configurations for the board and its peripherals.
-
-config MACH_MX51_BABBAGE
-	bool "Support MX51 BABBAGE platforms"
-	help
-	  Include support for MX51 Babbage platform. This includes specific
-	  configurations for the board and its peripherals.
-
-config MODULE_CCXMX51
-	bool
-
-config MACH_CCWMX51JS
-	bool "Support for the ConnectCore Wi-i.MX51 module, on the JSK base board"
-	select MODULE_CCXMX51
-	help
-	  Include support for the Digi ConnectCore Wi-i.MX51 Embedded Module, on the
-	  JumpStart Kit base board. This includes specific configurations for the
-	  peripherals on that base board.
-
-config MACH_CCMX51JS
-	bool "Support for the ConnectCore i.MX51 module, on the JSK base board"
-	select MODULE_CCXMX51
-	help
-	  Include support for the Digi ConnectCore i.MX51 Embedded Module, on the
-	  JumpStart Kit base board. This includes specific configurations for the
-	  peripherals on that base board.
-
-config MACH_CCWMX51
-	bool "Support for the ConnectCore Wi-i.MX51 module"
-	select MODULE_CCXMX51
-	help
-	  Include support for the Digi ConnectCore Wi-i.MX51 Embedded Module, on a
-	  custom board. The machine file should be modified to include support for
-	  the interfaces available in that board.
-
-config MACH_CCMX51
-	bool "Support for the ConnectCore i.MX51 module"
-	select MODULE_CCXMX51
-	help
-	  Include support for the Digi ConnectCore Wi-i.MX51 Embedded Module, on a
-	  custom board. The machine file should be modified to include support for
-	  the interfaces available in that board.
-
-config MXC_SDMA_API
-        bool "Use SDMA API"
-        default y
-        help
-           This selects the Freescale MXC SDMA API.
-           If unsure, say N.
-
-config ARCH_MXC_HAS_NFC_V3
-        bool "MXC NFC Hardware Version 3"
-        depends on ARCH_MX51
-        default y
-        help
-           This selects the Freescale MXC Nand Flash Controller Hardware Version 3
-           If unsure, say N.
-
-config ARCH_MXC_HAS_NFC_V3_2
-        bool "MXC NFC Hardware Version 3.2"
-        depends on ARCH_MXC_HAS_NFC_V3
-        default y
-        help
-           This selects the Freescale MXC Nand Flash Controller Hardware Version 3.2
-           If unsure, say N.
-
-config SDMA_IRAM
-        bool "Use Internal RAM for SDMA transfer"
-        depends on MXC_SDMA_API
-	help
-           Support Internal RAM as SDMA buffer or control structures
-endmenu
-
-
-menu "Serial Port Options"
-config UART1_ENABLED
-	bool "Enable UART1"
-	default y
-	depends on SERIAL_MXC
-	help
-	  Enable the MX51 UART1 interface
-
-config UART2_ENABLED
-	bool "Enable UART2"
-	default y
-	depends on SERIAL_MXC
-	help
-	  Enable the MX51 UART2 interface
-
-config UART3_ENABLED
-	bool "Enable UART3"
-	default y
-	depends on SERIAL_MXC
-	help
-	  Enable the MX51 UART3 interface
-endmenu
-
-menu "SPI Interface Options"
-config SPI_MXC_SELECT1
-	bool "Enable CSPI1"
-	depends on SPI_MXC
-	default y
-	help
-	  Enable the CSPI1 interface
-
-config SPI_MXC_SELECT1_SS1
-	bool "Enable SS1 line for CSPI1"
-	depends on SPI_MXC_SELECT1
-	default y
-	help
-          Enable SS1 (slave select 1) line, used on ConnectCore Wi-i.MX51 base board SPI connector
-
-config SPI_MXC_SELECT2
-	bool "Enable CSPI2"
-	depends on SPI_MXC
-	default n
-	help
-	  Enable the CSPI2 interface
-
-config SPI_MXC_SELECT3
-	bool "Enable CSPI3"
-	depends on SPI_MXC
-	default n
-	help
-	  Enable the CSPI3 interface
-endmenu
-
-source "arch/arm/mach-mx51/displays/Kconfig"
-
diff --git a/arch/arm/mach-mx51/Makefile b/arch/arm/mach-mx51/Makefile
deleted file mode 100644
index 1ec448c03eef..000000000000
--- a/arch/arm/mach-mx51/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# Makefile for the linux kernel.
-#
-
-# Object file lists.
-
-
-obj-y   := system.o iomux.o cpu.o mm.o clock.o devices.o serial.o dma.o lpmodes.o pm.o sdram_autogating.o bus_freq.o
-
-obj-y   := system.o iomux.o cpu.o mm.o clock.o devices.o serial.o dma.o lpmodes.o pm.o sdram_autogating.o bus_freq.o usb_dr.o usb_h1.o usb_h2.o dummy_gpio.o wfi.o suspend.o
-
-obj-$(CONFIG_MACH_MX51_3DS) += mx51_3stack.o mx51_3stack_gpio.o mx51_3stack_pmic_mc13892.o
-obj-$(CONFIG_MACH_MX51_BABBAGE) += mx51_babbage.o mx51_babbage_gpio.o mx51_babbage_pmic_mc13892.o
-obj-$(CONFIG_MACH_CCWMX51JS) += mx51_ccwmx51js.o mx51_ccwmx51js_gpio.o
-obj-$(CONFIG_MXC_PMIC_MC13892) +=  mx51_ccwmx51js_pmic_mc13892.o
-
diff --git a/arch/arm/mach-mx51/board.h b/arch/arm/mach-mx51/board.h
deleted file mode 100644
index e269ab46fb5a..000000000000
--- a/arch/arm/mach-mx51/board.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2010 Digi International, Inc. All Rights Reserved.
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-#ifndef __ASM_ARCH_MXC_BOARD_H__
-#define __ASM_ARCH_MXC_BOARD_H__
-
-#if defined(CONFIG_MACH_CCWMX51JS) || defined(CONFIG_MACH_CCMX51JS) || \
-    defined(CONFIG_MACH_CCWMX51) || defined(CONFIG_MACH_CCMX51)
-#include "board-ccwmx51.h"
-#elif defined(MACH_MX51_3DS)
-#include "board-3stack.h"
-#elif defined(MACH_MX51_BABBAGE)
-#include "board-mx51_babbage.h"
-#endif
-
-#endif	/* __ASM_ARCH_MXC_BOARD_H__ */
diff --git a/arch/arm/mach-mx51/clock.c b/arch/arm/mach-mx51/clock.c
deleted file mode 100644
index f88387af7048..000000000000
--- a/arch/arm/mach-mx51/clock.c
+++ /dev/null
@@ -1,3990 +0,0 @@
-/*
- * Copyright (C) 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/time.h>
-#include <linux/hrtimer.h>
-#include <linux/mm.h>
-#include <linux/errno.h>
-#include <linux/delay.h>
-#include <linux/clk.h>
-#include <asm/io.h>
-#include <asm/div64.h>
-#include <mach/hardware.h>
-#include <mach/common.h>
-#include <mach/clock.h>
-#include <mach/mxc_dvfs.h>
-#include <mach/sdram_autogating.h>
-
-#include "crm_regs.h"
-
-static struct clk pll1_main_clk;
-static struct clk pll1_sw_clk;
-static struct clk pll2_sw_clk;
-static struct clk pll3_sw_clk;
-static struct clk lp_apm_clk;
-static struct clk tve_clk;
-static struct clk emi_fast_clk;
-static struct clk emi_slow_clk;
-static struct clk emi_intr_clk;
-static struct clk ddr_clk;
-static struct clk ipu_clk[];
-static struct clk axi_a_clk;
-static struct clk axi_b_clk;
-static struct clk ddr_hf_clk;
-static struct clk mipi_hsp_clk;
-static struct clk gpu3d_clk;
-static struct clk gpu2d_clk;
-static struct clk vpu_clk[];
-static int cpu_curr_wp;
-static struct cpu_wp *cpu_wp_tbl;
-
-void __iomem *pll1_base;
-void __iomem *pll2_base;
-void __iomem *pll3_base;
-
-int cpu_wp_nr;
-int lp_high_freq;
-int lp_med_freq;
-
-#define SPIN_DELAY	1000000 /* in nanoseconds */
-
-extern int mxc_jtag_enabled;
-extern int uart_at_24;
-extern int cpufreq_trig_needed;
-extern int low_bus_freq_mode;
-
-static int cpu_clk_set_wp(int wp);
-extern void propagate_rate(struct clk *tclk);
-struct cpu_wp *(*get_cpu_wp)(int *wp);
-void (*set_num_cpu_wp)(int num);
-
-static void __calc_pre_post_dividers(u32 div, u32 *pre, u32 *post)
-{
-	u32 min_pre, temp_pre, old_err, err;
-
-	if (div >= 512) {
-		*pre = 8;
-		*post = 64;
-	} else if (div >= 8) {
-		min_pre = (div - 1) / 64 + 1;
-		old_err = 8;
-		for (temp_pre = 8; temp_pre >= min_pre; temp_pre--) {
-			err = div % temp_pre;
-			if (err == 0) {
-				*pre = temp_pre;
-				break;
-			}
-			err = temp_pre - err;
-			if (err < old_err) {
-				old_err = err;
-				*pre = temp_pre;
-			}
-		}
-		*post = (div + *pre - 1) / *pre;
-	} else if (div < 8) {
-		*pre = div;
-		*post = 1;
-	}
-}
-
-static int _clk_enable(struct clk *clk)
-{
-	u32 reg;
-	reg = __raw_readl(clk->enable_reg);
-	reg |= MXC_CCM_CCGR_CG_MASK << clk->enable_shift;
-	__raw_writel(reg, clk->enable_reg);
-
-	if (clk->flags & AHB_HIGH_SET_POINT)
-		lp_high_freq++;
-	else if (clk->flags & AHB_MED_SET_POINT)
-		lp_med_freq++;
-
-
-	return 0;
-}
-
-static int _clk_enable_inrun(struct clk *clk)
-{
-	u32 reg;
-
-	reg = __raw_readl(clk->enable_reg);
-	reg &= ~(MXC_CCM_CCGR_CG_MASK << clk->enable_shift);
-	reg |= 1 << clk->enable_shift;
-	__raw_writel(reg, clk->enable_reg);
-	return 0;
-}
-
-static void _clk_disable(struct clk *clk)
-{
-	u32 reg;
-	reg = __raw_readl(clk->enable_reg);
-	reg &= ~(MXC_CCM_CCGR_CG_MASK << clk->enable_shift);
-	__raw_writel(reg, clk->enable_reg);
-
-	if (clk->flags & AHB_HIGH_SET_POINT)
-		lp_high_freq--;
-	else if (clk->flags & AHB_MED_SET_POINT)
-		lp_med_freq--;
-}
-
-static void _clk_disable_inwait(struct clk *clk)
-{
-	u32 reg;
-	reg = __raw_readl(clk->enable_reg);
-	reg &= ~(MXC_CCM_CCGR_CG_MASK << clk->enable_shift);
-	reg |= 1 << clk->enable_shift;
-	__raw_writel(reg, clk->enable_reg);
-}
-
-/*
- * For the 4-to-1 muxed input clock
- */
-static inline u32 _get_mux(struct clk *parent, struct clk *m0,
-			   struct clk *m1, struct clk *m2, struct clk *m3)
-{
-	if (parent == m0)
-		return 0;
-	else if (parent == m1)
-		return 1;
-	else if (parent == m2)
-		return 2;
-	else if (parent == m3)
-		return 3;
-	else
-		BUG();
-
-	return 0;
-}
-
-/*
- * For the ddr muxed input clock
- */
-static inline u32 _get_mux_ddr(struct clk *parent, struct clk *m0,
-			   struct clk *m1, struct clk *m2, struct clk *m3, struct clk *m4)
-{
-	if (parent == m0)
-		return 0;
-	else if (parent == m1)
-		return 1;
-	else if (parent == m2)
-		return 2;
-	else if (parent == m3)
-		return 3;
-	else if (parent == m4)
-		return 4;
-	else
-		BUG();
-
-	return 0;
-}
-
-static inline void __iomem *_get_pll_base(struct clk *pll)
-{
-	if (pll == &pll1_main_clk)
-		return pll1_base;
-	else if (pll == &pll2_sw_clk)
-		return pll2_base;
-	else if (pll == &pll3_sw_clk)
-		return pll3_base;
-	else
-		BUG();
-
-	return NULL;
-}
-
-static struct clk ckih_clk = {
-	.name = "ckih",
-	.flags = RATE_PROPAGATES,
-};
-
-static struct clk ckih2_clk = {
-	.name = "ckih2",
-	.flags = RATE_PROPAGATES,
-};
-
-static struct clk osc_clk = {
-	.name = "osc",
-	.flags = RATE_PROPAGATES,
-};
-
-static struct clk ckil_clk = {
-	.name = "ckil",
-	.flags = RATE_PROPAGATES,
-};
-
-static void _fpm_recalc(struct clk *clk)
-{
-	clk->rate = ckil_clk.rate * 512;
-	if ((__raw_readl(MXC_CCM_CCR) & MXC_CCM_CCR_FPM_MULT_MASK) != 0)
-		clk->rate *= 2;
-
-}
-
-static int _fpm_enable(struct clk *clk)
-{
-	u32 reg = __raw_readl(MXC_CCM_CCR);
-	reg |= MXC_CCM_CCR_FPM_EN;
-	__raw_writel(reg, MXC_CCM_CCR);
-	return 0;
-}
-
-static void _fpm_disable(struct clk *clk)
-{
-	u32 reg = __raw_readl(MXC_CCM_CCR);
-	reg &= ~MXC_CCM_CCR_FPM_EN;
-	__raw_writel(reg, MXC_CCM_CCR);
-}
-
-static struct clk fpm_clk = {
-	.name = "fpm_clk",
-	.parent = &ckil_clk,
-	.recalc = _fpm_recalc,
-	.enable = _fpm_enable,
-	.disable = _fpm_disable,
-	.flags = RATE_PROPAGATES,
-};
-
-static void _fpm_div2_recalc(struct clk *clk)
-{
-	clk->rate = clk->parent->rate / 2;
-}
-
-static struct clk fpm_div2_clk = {
-	.name = "fpm_div2_clk",
-	.parent = &fpm_clk,
-	.recalc = _fpm_div2_recalc,
-	.flags = RATE_PROPAGATES,
-};
-
-static void _clk_pll_recalc(struct clk *clk)
-{
-	long mfi, mfn, mfd, pdf, ref_clk, mfn_abs;
-	unsigned long dp_op, dp_mfd, dp_mfn, dp_ctl, pll_hfsm, dbl;
-	void __iomem *pllbase;
-	s64 temp;
-
-	pllbase = _get_pll_base(clk);
-
-	dp_ctl = __raw_readl(pllbase + MXC_PLL_DP_CTL);
-	pll_hfsm = dp_ctl & MXC_PLL_DP_CTL_HFSM;
-	dbl = dp_ctl & MXC_PLL_DP_CTL_DPDCK0_2_EN;
-
-	if (pll_hfsm == 0) {
-		dp_op = __raw_readl(pllbase + MXC_PLL_DP_OP);
-		dp_mfd = __raw_readl(pllbase + MXC_PLL_DP_MFD);
-		dp_mfn = __raw_readl(pllbase + MXC_PLL_DP_MFN);
-	} else {
-		dp_op = __raw_readl(pllbase + MXC_PLL_DP_HFS_OP);
-		dp_mfd = __raw_readl(pllbase + MXC_PLL_DP_HFS_MFD);
-		dp_mfn = __raw_readl(pllbase + MXC_PLL_DP_HFS_MFN);
-	}
-	pdf = dp_op & MXC_PLL_DP_OP_PDF_MASK;
-	mfi = (dp_op & MXC_PLL_DP_OP_MFI_MASK) >> MXC_PLL_DP_OP_MFI_OFFSET;
-	mfi = (mfi <= 5) ? 5 : mfi;
-	mfd = dp_mfd & MXC_PLL_DP_MFD_MASK;
-	mfn = mfn_abs = dp_mfn & MXC_PLL_DP_MFN_MASK;
-	/* Sign extend to 32-bits */
-	if (mfn >= 0x04000000) {
-		mfn |= 0xFC000000;
-		mfn_abs = -mfn;
-	}
-
-	ref_clk = 2 * clk->parent->rate;
-	if (dbl != 0)
-		ref_clk *= 2;
-
-	ref_clk /= (pdf + 1);
-	temp = (u64) ref_clk * mfn_abs;
-	do_div(temp, mfd + 1);
-	if (mfn < 0)
-		temp = -temp;
-	temp = (ref_clk * mfi) + temp;
-
-	clk->rate = temp;
-}
-
-static int _clk_pll_set_rate(struct clk *clk, unsigned long rate)
-{
-	u32 reg, reg1;
-	void __iomem *pllbase;
-	struct timespec nstimeofday;
-	struct timespec curtime;
-
-	long mfi, pdf, mfn, mfd = 999999;
-	s64 temp64;
-	unsigned long quad_parent_rate;
-	unsigned long pll_hfsm, dp_ctl;
-
-	pllbase = _get_pll_base(clk);
-
-	quad_parent_rate = 4*clk->parent->rate;
-	pdf = mfi = -1;
-	while (++pdf < 16 && mfi < 5)
-		mfi = rate * (pdf+1) / quad_parent_rate;
-	if (mfi > 15)
-		return -1;
-	pdf--;
-
-	temp64 = rate*(pdf+1) - quad_parent_rate*mfi;
-	do_div(temp64, quad_parent_rate/1000000);
-	mfn = (long)temp64;
-
-	dp_ctl = __raw_readl(pllbase + MXC_PLL_DP_CTL);
-	/* use dpdck0_2 */
-	__raw_writel(dp_ctl | 0x1000L, pllbase + MXC_PLL_DP_CTL);
-	pll_hfsm = dp_ctl & MXC_PLL_DP_CTL_HFSM;
-	if (pll_hfsm == 0) {
-		reg = mfi<<4 | pdf;
-		__raw_writel(reg, pllbase + MXC_PLL_DP_OP);
-		__raw_writel(mfd, pllbase + MXC_PLL_DP_MFD);
-		__raw_writel(mfn, pllbase + MXC_PLL_DP_MFN);
-	} else {
-		reg = mfi<<4 | pdf;
-		__raw_writel(reg, pllbase + MXC_PLL_DP_HFS_OP);
-		__raw_writel(mfd, pllbase + MXC_PLL_DP_HFS_MFD);
-		__raw_writel(mfn, pllbase + MXC_PLL_DP_HFS_MFN);
-	}
-	/* If auto restart is disabled, restart the PLL and
-	  * wait for it to lock.
-	  */
-	reg = __raw_readl(pllbase + MXC_PLL_DP_CTL);
-	if (reg & MXC_PLL_DP_CTL_UPEN) {
-		reg = __raw_readl(pllbase + MXC_PLL_DP_CONFIG);
-		if (!(reg & MXC_PLL_DP_CONFIG_AREN)) {
-			reg1 = __raw_readl(pllbase + MXC_PLL_DP_CTL);
-			reg1 |= MXC_PLL_DP_CTL_RST;
-			__raw_writel(reg1, pllbase + MXC_PLL_DP_CTL);
-		}
-		/* Wait for lock */
-		getnstimeofday(&nstimeofday);
-		while (!(__raw_readl(pllbase + MXC_PLL_DP_CTL)
-					& MXC_PLL_DP_CTL_LRF)) {
-			getnstimeofday(&curtime);
-			if (curtime.tv_nsec - nstimeofday.tv_nsec > SPIN_DELAY)
-				panic("pll_set_rate: pll relock failed\n");
-		}
-	}
-	clk->rate = rate;
-	return 0;
-}
-
-static int _clk_pll_enable(struct clk *clk)
-{
-	u32 reg;
-	void __iomem *pllbase;
-	struct timespec nstimeofday;
-	struct timespec curtime;
-
-	pllbase = _get_pll_base(clk);
-	reg = __raw_readl(pllbase + MXC_PLL_DP_CTL) | MXC_PLL_DP_CTL_UPEN;
-	__raw_writel(reg, pllbase + MXC_PLL_DP_CTL);
-
-	/* Wait for lock */
-	getnstimeofday(&nstimeofday);
-	while (!(__raw_readl(pllbase + MXC_PLL_DP_CTL) & MXC_PLL_DP_CTL_LRF)) {
-		getnstimeofday(&curtime);
-		if (curtime.tv_nsec - nstimeofday.tv_nsec > SPIN_DELAY)
-			panic("pll relock failed\n");
-	}
-	return 0;
-}
-
-static void _clk_pll_disable(struct clk *clk)
-{
-	u32 reg;
-	void __iomem *pllbase;
-
-	pllbase = _get_pll_base(clk);
-	reg = __raw_readl(pllbase + MXC_PLL_DP_CTL) & ~MXC_PLL_DP_CTL_UPEN;
-	__raw_writel(reg, pllbase + MXC_PLL_DP_CTL);
-}
-
-static struct clk pll1_main_clk = {
-	.name = "pll1_main_clk",
-	.parent = &osc_clk,
-	.recalc = _clk_pll_recalc,
-	.enable = _clk_pll_enable,
-	.disable = _clk_pll_disable,
-	.flags = RATE_PROPAGATES,
-};
-
-static int _clk_pll1_sw_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-
-	reg = __raw_readl(MXC_CCM_CCSR);
-
-	if (parent == &pll1_main_clk) {
-		reg &= ~MXC_CCM_CCSR_PLL1_SW_CLK_SEL;
-		__raw_writel(reg, MXC_CCM_CCSR);
-		/* Set the step_clk parent to be lp_apm, to save power. */
-		mux = _get_mux(&lp_apm_clk, &lp_apm_clk, NULL, &pll2_sw_clk,
-			       &pll3_sw_clk);
-		reg = __raw_readl(MXC_CCM_CCSR);
-		reg = (reg & ~MXC_CCM_CCSR_STEP_SEL_MASK) |
-		    (mux << MXC_CCM_CCSR_STEP_SEL_OFFSET);
-	} else {
-		if (parent == &lp_apm_clk) {
-			reg |= MXC_CCM_CCSR_PLL1_SW_CLK_SEL;
-			reg = __raw_readl(MXC_CCM_CCSR);
-			mux = _get_mux(parent, &lp_apm_clk, NULL, &pll2_sw_clk,
-				       &pll3_sw_clk);
-			reg = (reg & ~MXC_CCM_CCSR_STEP_SEL_MASK) |
-			    (mux << MXC_CCM_CCSR_STEP_SEL_OFFSET);
-		} else {
-			mux = _get_mux(parent, &lp_apm_clk, NULL, &pll2_sw_clk,
-				       &pll3_sw_clk);
-			reg = (reg & ~MXC_CCM_CCSR_STEP_SEL_MASK) |
-			    (mux << MXC_CCM_CCSR_STEP_SEL_OFFSET);
-			__raw_writel(reg, MXC_CCM_CCSR);
-			reg = __raw_readl(MXC_CCM_CCSR);
-			reg |= MXC_CCM_CCSR_PLL1_SW_CLK_SEL;
-
-		}
-	}
-	__raw_writel(reg, MXC_CCM_CCSR);
-
-	return 0;
-}
-
-static void _clk_pll1_sw_recalc(struct clk *clk)
-{
-	u32 reg, div;
-	div = 1;
-	reg = __raw_readl(MXC_CCM_CCSR);
-
-	if (clk->parent == &pll2_sw_clk) {
-		div = ((reg & MXC_CCM_CCSR_PLL2_PODF_MASK) >>
-		       MXC_CCM_CCSR_PLL2_PODF_OFFSET) + 1;
-	} else if (clk->parent == &pll3_sw_clk) {
-		div = ((reg & MXC_CCM_CCSR_PLL3_PODF_MASK) >>
-		       MXC_CCM_CCSR_PLL3_PODF_OFFSET) + 1;
-	}
-	clk->rate = clk->parent->rate / div;
-}
-
-/* pll1 switch clock */
-static struct clk pll1_sw_clk = {
-	.name = "pll1_sw_clk",
-	.parent = &pll1_main_clk,
-	.set_parent = _clk_pll1_sw_set_parent,
-	.recalc = _clk_pll1_sw_recalc,
-	.flags = RATE_PROPAGATES,
-};
-
-static int _clk_pll2_sw_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg;
-
-	reg = __raw_readl(MXC_CCM_CCSR);
-
-	if (parent == &pll2_sw_clk) {
-		reg &= ~MXC_CCM_CCSR_PLL2_SW_CLK_SEL;
-	} else {
-		reg = (reg & ~MXC_CCM_CCSR_PLL2_SW_CLK_SEL);
-		reg |= MXC_CCM_CCSR_PLL2_SW_CLK_SEL;
-	}
-	__raw_writel(reg, MXC_CCM_CCSR);
-	return 0;
-}
-
-/* same as pll2_main_clk. These two clocks should always be the same */
-static struct clk pll2_sw_clk = {
-	.name = "pll2",
-	.parent = &osc_clk,
-	.recalc = _clk_pll_recalc,
-	.enable = _clk_pll_enable,
-	.disable = _clk_pll_disable,
-	.set_rate = _clk_pll_set_rate,
-	.set_parent = _clk_pll2_sw_set_parent,
-	.flags = RATE_PROPAGATES,
-};
-
-/* same as pll3_main_clk. These two clocks should always be the same */
-static struct clk pll3_sw_clk = {
-	.name = "pll3",
-	.parent = &osc_clk,
-	.set_rate = _clk_pll_set_rate,
-	.recalc = _clk_pll_recalc,
-	.enable = _clk_pll_enable,
-	.disable = _clk_pll_disable,
-	.flags = RATE_PROPAGATES,
-};
-
-static int _clk_lp_apm_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg;
-
-	if (parent == &osc_clk)
-		reg = __raw_readl(MXC_CCM_CCSR) & ~MXC_CCM_CCSR_LP_APM_SEL;
-	else if (parent == &fpm_clk)
-		reg = __raw_readl(MXC_CCM_CCSR) | MXC_CCM_CCSR_LP_APM_SEL;
-	else
-		return -EINVAL;
-
-	__raw_writel(reg, MXC_CCM_CCSR);
-
-	return 0;
-}
-
-static struct clk lp_apm_clk = {
-	.name = "lp_apm",
-	.parent = &osc_clk,
-	.set_parent = _clk_lp_apm_set_parent,
-	.flags = RATE_PROPAGATES,
-};
-
-static void _clk_arm_recalc(struct clk *clk)
-{
-	u32 cacrr, div;
-
-	cacrr = __raw_readl(MXC_CCM_CACRR);
-	div = (cacrr & MXC_CCM_CACRR_ARM_PODF_MASK) + 1;
-	clk->rate = clk->parent->rate / div;
-}
-
-static int _clk_cpu_set_rate(struct clk *clk, unsigned long rate)
-{
-	u32 i;
-	for (i = 0; i < cpu_wp_nr; i++) {
-		if (rate == cpu_wp_tbl[i].cpu_rate)
-			break;
-	}
-	if (i >= cpu_wp_nr)
-		return -EINVAL;
-	cpu_clk_set_wp(i);
-
-	return 0;
-}
-
-static unsigned long _clk_cpu_round_rate(struct clk *clk,
-						unsigned long rate)
-{
-	u32 i;
-	u32 wp;
-
-	for (i = 0; i < cpu_wp_nr; i++) {
-		if (rate == cpu_wp_tbl[i].cpu_rate)
-			break;
-	}
-
-	if (i > cpu_wp_nr)
-		wp = 0;
-
-	return cpu_wp_tbl[wp].cpu_rate;
-}
-
-
-static struct clk cpu_clk = {
-	.name = "cpu_clk",
-	.parent = &pll1_sw_clk,
-	.recalc = _clk_arm_recalc,
-	.set_rate = _clk_cpu_set_rate,
-	.round_rate = _clk_cpu_round_rate,
-};
-
-static int _clk_periph_apm_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-	struct timespec nstimeofday;
-	struct timespec curtime;
-
-	mux = _get_mux(parent, &pll1_sw_clk, &pll3_sw_clk, &lp_apm_clk, NULL);
-
-	reg = __raw_readl(MXC_CCM_CBCMR) & ~MXC_CCM_CBCMR_PERIPH_CLK_SEL_MASK;
-	reg |= mux << MXC_CCM_CBCMR_PERIPH_CLK_SEL_OFFSET;
-	__raw_writel(reg, MXC_CCM_CBCMR);
-
-	getnstimeofday(&nstimeofday);
-	while (__raw_readl(MXC_CCM_CDHIPR) &
-			MXC_CCM_CDHIPR_PERIPH_CLK_SEL_BUSY) {
-		getnstimeofday(&curtime);
-		if (curtime.tv_nsec - nstimeofday.tv_nsec > SPIN_DELAY)
-			panic("pll _clk_periph_apm_set_parent failed\n");
-	}
-	return 0;
-}
-
-static struct clk periph_apm_clk = {
-	.name = "periph_apm_clk",
-	.parent = &pll1_sw_clk,
-	.set_parent = _clk_periph_apm_set_parent,
-	.flags = RATE_PROPAGATES,
-};
-
-/* TODO: Need to sync with GPC to determine if DVFS is in place so that
- * the DVFS_PODF divider can be applied in CDCR register.
- */
-static void _clk_main_bus_recalc(struct clk *clk)
-{
-	u32 div = 0;
-
-	if (dvfs_per_divider_active() || low_bus_freq_mode)
-		div  = (__raw_readl(MXC_CCM_CDCR) & 0x3);
-	clk->rate = clk->parent->rate / (div + 1);
-}
-
-static int _clk_main_bus_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg;
-	if (emi_fast_clk.usecount == 0)
-		emi_fast_clk.enable(&emi_fast_clk);
-	if (emi_slow_clk.usecount == 0)
-		emi_slow_clk.enable(&emi_slow_clk);
-
-	if (parent == &pll2_sw_clk) {
-		reg = __raw_readl(MXC_CCM_CBCDR) &
-		    ~MXC_CCM_CBCDR_PERIPH_CLK_SEL;
-	} else if (parent == &periph_apm_clk) {
-		reg = __raw_readl(MXC_CCM_CBCDR) | MXC_CCM_CBCDR_PERIPH_CLK_SEL;
-	} else {
-		return -EINVAL;
-	}
-	__raw_writel(reg, MXC_CCM_CBCDR);
-	if (emi_fast_clk.usecount == 0)
-		emi_fast_clk.disable(&emi_fast_clk);
-	if (emi_slow_clk.usecount == 0)
-		emi_slow_clk.disable(&emi_slow_clk);
-
-	return 0;
-}
-
-static struct clk main_bus_clk = {
-	.name = "main_bus_clk",
-	.parent = &pll2_sw_clk,
-	.set_parent = _clk_main_bus_set_parent,
-	.recalc = _clk_main_bus_recalc,
-	.flags = RATE_PROPAGATES,
-};
-
-static void _clk_axi_a_recalc(struct clk *clk)
-{
-	u32 reg, div;
-
-	reg = __raw_readl(MXC_CCM_CBCDR);
-	div = ((reg & MXC_CCM_CBCDR_AXI_A_PODF_MASK) >>
-	       MXC_CCM_CBCDR_AXI_A_PODF_OFFSET) + 1;
-	clk->rate = clk->parent->rate / div;
-}
-
-static int _clk_axi_a_set_rate(struct clk *clk, unsigned long rate)
-{
-	u32 reg, div;
-	struct timespec nstimeofday;
-	struct timespec curtime;
-
-	div = clk->parent->rate / rate;
-	if (div == 0)
-		div++;
-	if (((clk->parent->rate / div) != rate) || (div > 8))
-		return -EINVAL;
-	if (emi_fast_clk.usecount == 0)
-		emi_fast_clk.enable(&emi_fast_clk);
-	if (emi_slow_clk.usecount == 0)
-		emi_slow_clk.enable(&emi_slow_clk);
-
-	reg = __raw_readl(MXC_CCM_CBCDR);
-	reg &= ~MXC_CCM_CBCDR_AXI_A_PODF_MASK;
-	reg |= (div - 1) << MXC_CCM_CBCDR_AXI_A_PODF_OFFSET;
-	__raw_writel(reg, MXC_CCM_CBCDR);
-
-	getnstimeofday(&nstimeofday);
-	while (__raw_readl(MXC_CCM_CDHIPR) & MXC_CCM_CDHIPR_AXI_A_PODF_BUSY) {
-		getnstimeofday(&curtime);
-		if (curtime.tv_nsec - nstimeofday.tv_nsec > SPIN_DELAY)
-			panic("pll _clk_axi_a_set_rate failed\n");
-	}
-	clk->rate = rate;
-	if (emi_fast_clk.usecount == 0)
-		emi_fast_clk.disable(&emi_fast_clk);
-	if (emi_slow_clk.usecount == 0)
-		emi_slow_clk.disable(&emi_slow_clk);
-
-	return 0;
-}
-
-static unsigned long _clk_axi_a_round_rate(struct clk *clk,
-						unsigned long rate)
-{
-	u32 div;
-
-	div = clk->parent->rate / rate;
-	if (div > 8)
-		div = 8;
-	else if (div == 0)
-		div++;
-	return clk->parent->rate / div;
-}
-
-
-static struct clk axi_a_clk = {
-	.name = "axi_a_clk",
-	.parent = &main_bus_clk,
-	.recalc = _clk_axi_a_recalc,
-	.set_rate = _clk_axi_a_set_rate,
-	.round_rate = _clk_axi_a_round_rate,
-	.flags = RATE_PROPAGATES,
-};
-
-static void _clk_ddr_hf_recalc(struct clk *clk)
-{
-	u32 reg, div;
-
-	reg = __raw_readl(MXC_CCM_CBCDR);
-	div = ((reg & MXC_CCM_CBCDR_DDR_PODF_MASK) >>
-	       MXC_CCM_CBCDR_DDR_PODF_OFFSET) + 1;
-	clk->rate = clk->parent->rate / div;
-}
-
-static unsigned long _clk_ddr_hf_round_rate(struct clk *clk,
-						unsigned long rate)
-{
-	u32 div;
-
-	div = clk->parent->rate / rate;
-	if (div > 8)
-		div = 8;
-	else if (div == 0)
-		div++;
-	return clk->parent->rate / div;
-}
-
-static int _clk_ddr_hf_set_rate(struct clk *clk, unsigned long rate)
-{
-	u32 reg, div;
-	struct timespec nstimeofday;
-	struct timespec curtime;
-
-	div = clk->parent->rate / rate;
-	if (div == 0)
-		div++;
-	if (((clk->parent->rate / div) != rate) || (div > 8))
-		return -EINVAL;
-	if (emi_fast_clk.usecount == 0)
-		emi_fast_clk.enable(&emi_fast_clk);
-	if (emi_slow_clk.usecount == 0)
-		emi_slow_clk.enable(&emi_slow_clk);
-
-	reg = __raw_readl(MXC_CCM_CBCDR);
-	reg &= ~MXC_CCM_CBCDR_DDR_PODF_MASK;
-	reg |= (div - 1) << MXC_CCM_CBCDR_DDR_PODF_OFFSET;
-	__raw_writel(reg, MXC_CCM_CBCDR);
-
-	getnstimeofday(&nstimeofday);
-	while (__raw_readl(MXC_CCM_CDHIPR) & MXC_CCM_CDHIPR_DDR_PODF_BUSY) {
-		getnstimeofday(&curtime);
-		if (curtime.tv_nsec - nstimeofday.tv_nsec > SPIN_DELAY)
-			panic("clk_ddr_hf_set_rate failed\n");
-	}
-	clk->rate = rate;
-	if (emi_fast_clk.usecount == 0)
-		emi_fast_clk.disable(&emi_fast_clk);
-	if (emi_slow_clk.usecount == 0)
-		emi_slow_clk.disable(&emi_slow_clk);
-
-	return 0;
-}
-
-static struct clk ddr_hf_clk = {
-	.name = "ddr_hf_clk",
-	.parent = &pll1_sw_clk,
-	.recalc = _clk_ddr_hf_recalc,
-	.round_rate = _clk_ddr_hf_round_rate,
-	.set_rate = _clk_ddr_hf_set_rate,
-	.flags = RATE_PROPAGATES,
-};
-
-static void _clk_axi_b_recalc(struct clk *clk)
-{
-	u32 reg, div;
-
-	reg = __raw_readl(MXC_CCM_CBCDR);
-	div = ((reg & MXC_CCM_CBCDR_AXI_B_PODF_MASK) >>
-	       MXC_CCM_CBCDR_AXI_B_PODF_OFFSET) + 1;
-	clk->rate = clk->parent->rate / div;
-}
-
-static int _clk_axi_b_set_rate(struct clk *clk, unsigned long rate)
-{
-	u32 reg, div;
-	struct timespec nstimeofday;
-	struct timespec curtime;
-
-	div = clk->parent->rate / rate;
-	if (div == 0)
-		div++;
-	if (((clk->parent->rate / div) != rate) || (div > 8))
-		return -EINVAL;
-
-	emi_fast_clk.enable(&emi_fast_clk);
-	if (emi_slow_clk.usecount == 0)
-		emi_slow_clk.enable(&emi_slow_clk);
-
-	reg = __raw_readl(MXC_CCM_CBCDR);
-	reg &= ~MXC_CCM_CBCDR_AXI_B_PODF_MASK;
-	reg |= (div - 1) << MXC_CCM_CBCDR_AXI_B_PODF_OFFSET;
-	__raw_writel(reg, MXC_CCM_CBCDR);
-
-	getnstimeofday(&nstimeofday);
-	while (__raw_readl(MXC_CCM_CDHIPR) & MXC_CCM_CDHIPR_AXI_B_PODF_BUSY) {
-		getnstimeofday(&curtime);
-		if (curtime.tv_nsec - nstimeofday.tv_nsec > SPIN_DELAY)
-			panic("_clk_axi_b_set_rate failed\n");
-	}
-
-	clk->rate = rate;
-	emi_fast_clk.disable(&emi_fast_clk);
-	if (emi_slow_clk.usecount == 0)
-		emi_slow_clk.disable(&emi_slow_clk);
-
-	return 0;
-}
-
-static unsigned long _clk_axi_b_round_rate(struct clk *clk,
-						unsigned long rate)
-{
-	u32 div;
-
-	div = clk->parent->rate / rate;
-	if (div > 8)
-		div = 8;
-	else if (div == 0)
-		div++;
-	return clk->parent->rate / div;
-}
-
-
-static struct clk axi_b_clk = {
-	.name = "axi_b_clk",
-	.parent = &main_bus_clk,
-	.recalc = _clk_axi_b_recalc,
-	.set_rate = _clk_axi_b_set_rate,
-	.round_rate = _clk_axi_b_round_rate,
-	.flags = RATE_PROPAGATES,
-};
-
-static void _clk_ahb_recalc(struct clk *clk)
-{
-	u32 reg, div;
-
-	reg = __raw_readl(MXC_CCM_CBCDR);
-	div = ((reg & MXC_CCM_CBCDR_AHB_PODF_MASK) >>
-	       MXC_CCM_CBCDR_AHB_PODF_OFFSET) + 1;
-	clk->rate = clk->parent->rate / div;
-}
-
-
-static int _clk_ahb_set_rate(struct clk *clk, unsigned long rate)
-{
-	u32 reg, div;
-	struct timespec nstimeofday;
-	struct timespec curtime;
-
-	div = clk->parent->rate / rate;
-	if (div == 0)
-		div++;
-	if (((clk->parent->rate / div) != rate) || (div > 8))
-		return -EINVAL;
-	if (emi_fast_clk.usecount == 0)
-		emi_fast_clk.enable(&emi_fast_clk);
-	if (emi_slow_clk.usecount == 0)
-		emi_slow_clk.enable(&emi_slow_clk);
-
-	reg = __raw_readl(MXC_CCM_CBCDR);
-	reg &= ~MXC_CCM_CBCDR_AHB_PODF_MASK;
-	reg |= (div - 1) << MXC_CCM_CBCDR_AHB_PODF_OFFSET;
-	__raw_writel(reg, MXC_CCM_CBCDR);
-
-	getnstimeofday(&nstimeofday);
-	while (__raw_readl(MXC_CCM_CDHIPR) & MXC_CCM_CDHIPR_AHB_PODF_BUSY) {
-		getnstimeofday(&curtime);
-		if (curtime.tv_nsec - nstimeofday.tv_nsec > SPIN_DELAY)
-			panic("_clk_ahb_set_rate failed\n");
-	}
-	clk->rate = rate;
-	if (emi_fast_clk.usecount == 0)
-		emi_fast_clk.disable(&emi_fast_clk);
-	if (emi_slow_clk.usecount == 0)
-		emi_slow_clk.disable(&emi_slow_clk);
-
-	return 0;
-}
-
-static unsigned long _clk_ahb_round_rate(struct clk *clk,
-						unsigned long rate)
-{
-	u32 div;
-
-	div = clk->parent->rate / rate;
-	if (div > 8)
-		div = 8;
-	else if (div == 0)
-		div++;
-	return clk->parent->rate / div;
-}
-
-
-static struct clk ahb_clk = {
-	.name = "ahb_clk",
-	.parent = &main_bus_clk,
-	.recalc = _clk_ahb_recalc,
-	.set_rate = _clk_ahb_set_rate,
-	.round_rate = _clk_ahb_round_rate,
-	.flags = RATE_PROPAGATES,
-};
-
-static int _clk_max_enable(struct clk *clk)
-{
-	u32 reg;
-
-	_clk_enable(clk);
-
-	/* Handshake with MAX when LPM is entered. */
-	reg = __raw_readl(MXC_CCM_CLPCR);
-	reg &= ~MXC_CCM_CLPCR_BYPASS_MAX_LPM_HS;
-	__raw_writel(reg, MXC_CCM_CLPCR);
-
-	return 0;
-}
-
-
-static void _clk_max_disable(struct clk *clk)
-{
-	u32 reg;
-
-	_clk_disable_inwait(clk);
-
-	/* No Handshake with MAX when LPM is entered as its disabled. */
-	reg = __raw_readl(MXC_CCM_CLPCR);
-	reg |= MXC_CCM_CLPCR_BYPASS_MAX_LPM_HS;
-	__raw_writel(reg, MXC_CCM_CLPCR);
-}
-
-
-static struct clk ahb_max_clk = {
-	.name = "max_clk",
-	.parent = &ahb_clk,
-	.enable_reg = MXC_CCM_CCGR0,
-	.enable_shift = MXC_CCM_CCGR0_CG14_OFFSET,
-	.enable = _clk_max_enable,
-	.disable = _clk_max_disable,
-};
-
-static int _clk_emi_slow_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg;
-
-	if (emi_fast_clk.usecount == 0)
-		emi_fast_clk.enable(&emi_fast_clk);
-	if (emi_slow_clk.usecount == 0)
-		emi_slow_clk.enable(&emi_slow_clk);
-
-	reg = __raw_readl(MXC_CCM_CBCDR);
-	if (parent == &ahb_clk) {
-		reg |= MXC_CCM_CBCDR_EMI_CLK_SEL;
-	} else if (parent == &main_bus_clk) {
-		reg &= ~MXC_CCM_CBCDR_EMI_CLK_SEL;
-	} else {
-		BUG();
-	}
-	__raw_writel(reg, MXC_CCM_CBCDR);
-
-	if (emi_fast_clk.usecount == 0)
-		emi_fast_clk.disable(&emi_fast_clk);
-	if (emi_slow_clk.usecount == 0)
-		emi_slow_clk.disable(&emi_slow_clk);
-
-	return 0;
-}
-
-static void _clk_emi_slow_recalc(struct clk *clk)
-{
-	u32 reg, div;
-
-	reg = __raw_readl(MXC_CCM_CBCDR);
-	div = ((reg & MXC_CCM_CBCDR_EMI_PODF_MASK) >>
-	       MXC_CCM_CBCDR_EMI_PODF_OFFSET) + 1;
-	clk->rate = clk->parent->rate / div;
-}
-
-static int _clk_emi_slow_set_rate(struct clk *clk, unsigned long rate)
-{
-	u32 reg, div;
-	struct timespec nstimeofday;
-	struct timespec curtime;
-
-	div = clk->parent->rate / rate;
-	if (div == 0)
-		div++;
-	if (((clk->parent->rate / div) != rate) || (div > 8))
-		return -EINVAL;
-	if (emi_fast_clk.usecount == 0)
-		emi_fast_clk.enable(&emi_fast_clk);
-	reg = __raw_readl(MXC_CCM_CBCDR);
-	reg &= ~MXC_CCM_CBCDR_EMI_PODF_MASK;
-	reg |= (div - 1) << MXC_CCM_CBCDR_EMI_PODF_OFFSET;
-	__raw_writel(reg, MXC_CCM_CBCDR);
-	getnstimeofday(&nstimeofday);
-	while (__raw_readl(MXC_CCM_CDHIPR) & MXC_CCM_CDHIPR_EMI_PODF_BUSY) {
-		getnstimeofday(&curtime);
-		if ((curtime.tv_nsec - nstimeofday.tv_nsec) > SPIN_DELAY)
-			panic("_clk_emi_slow_set_rate failed\n");
-	}
-	clk->rate = rate;
-
-	if (emi_fast_clk.usecount == 0)
-		emi_fast_clk.disable(&emi_fast_clk);
-	return 0;
-}
-
-static unsigned long _clk_emi_slow_round_rate(struct clk *clk,
-					      unsigned long rate)
-{
-	u32 div;
-
-	div = clk->parent->rate / rate;
-	if (div > 8)
-		div = 8;
-	else if (div == 0)
-		div++;
-	return clk->parent->rate / div;
-}
-
-
-static struct clk emi_slow_clk = {
-	.name = "emi_slow_clk",
-	.parent = &main_bus_clk,
-	.set_parent = _clk_emi_slow_set_parent,
-	.recalc = _clk_emi_slow_recalc,
-	.set_rate = _clk_emi_slow_set_rate,
-	.round_rate = _clk_emi_slow_round_rate,
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR5,
-	.enable_shift = MXC_CCM_CCGR5_CG8_OFFSET,
-	.disable = _clk_disable_inwait,
-	.flags = RATE_PROPAGATES,
-};
-
-static struct clk ahbmux1_clk = {
-	.name = "ahbmux1_clk",
-	.id = 0,
-	.parent = &ahb_clk,
-	.secondary = &ahb_max_clk,
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR0,
-	.enable_shift = MXC_CCM_CCGR0_CG8_OFFSET,
-	.disable = _clk_disable_inwait,
-};
-
-static struct clk ahbmux2_clk = {
-	.name = "ahbmux2_clk",
-	.id = 0,
-	.parent = &ahb_clk,
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR0,
-	.enable_shift = MXC_CCM_CCGR0_CG9_OFFSET,
-	.disable = _clk_disable_inwait,
-};
-
-
-static struct clk emi_fast_clk = {
-	.name = "emi_fast_clk",
-	.parent = &ddr_clk,
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR5,
-	.enable_shift = MXC_CCM_CCGR5_CG7_OFFSET,
-	.disable = _clk_disable_inwait,
-};
-
-static struct clk emi_intr_clk = {
-	.name = "emi_intr_clk",
-	.parent = &ahb_clk,
-	.secondary = &ahbmux2_clk,
-	.enable_reg = MXC_CCM_CCGR5,
-	.enable_shift = MXC_CCM_CCGR5_CG9_OFFSET,
-	.enable = _clk_enable,
-	.disable = _clk_disable_inwait,
-};
-
-static void _clk_ipg_recalc(struct clk *clk)
-{
-	u32 reg, div;
-
-	reg = __raw_readl(MXC_CCM_CBCDR);
-	div = ((reg & MXC_CCM_CBCDR_IPG_PODF_MASK) >>
-	       MXC_CCM_CBCDR_IPG_PODF_OFFSET) + 1;
-	clk->rate = clk->parent->rate / div;
-}
-
-static struct clk ipg_clk = {
-	.name = "ipg_clk",
-	.parent = &ahb_clk,
-	.recalc = _clk_ipg_recalc,
-	.flags = RATE_PROPAGATES,
-};
-
-static void _clk_ipg_per_recalc(struct clk *clk)
-{
-	u32 reg, prediv1, prediv2, podf;
-
-	if (clk->parent == &main_bus_clk || clk->parent == &lp_apm_clk) {
-		/* the main_bus_clk is the one before the DVFS engine */
-		reg = __raw_readl(MXC_CCM_CBCDR);
-		prediv1 = ((reg & MXC_CCM_CBCDR_PERCLK_PRED1_MASK) >>
-			   MXC_CCM_CBCDR_PERCLK_PRED1_OFFSET) + 1;
-		prediv2 = ((reg & MXC_CCM_CBCDR_PERCLK_PRED2_MASK) >>
-			   MXC_CCM_CBCDR_PERCLK_PRED2_OFFSET) + 1;
-		podf = ((reg & MXC_CCM_CBCDR_PERCLK_PODF_MASK) >>
-			MXC_CCM_CBCDR_PERCLK_PODF_OFFSET) + 1;
-		clk->rate = clk->parent->rate / (prediv1 * prediv2 * podf);
-	} else if (clk->parent == &ipg_clk) {
-		clk->rate = ipg_clk.rate;
-	} else {
-		BUG();
-	}
-}
-
-static int _clk_ipg_per_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-
-	reg = __raw_readl(MXC_CCM_CBCMR);
-	mux = _get_mux(parent, &main_bus_clk, &lp_apm_clk, &ipg_clk, NULL);
-	if (mux == 2) {
-		reg |= MXC_CCM_CBCMR_PERCLK_IPG_CLK_SEL;
-	} else {
-		reg &= ~MXC_CCM_CBCMR_PERCLK_IPG_CLK_SEL;
-		if (mux == 0)
-			reg &= ~MXC_CCM_CBCMR_PERCLK_LP_APM_CLK_SEL;
-		else
-			reg |= MXC_CCM_CBCMR_PERCLK_LP_APM_CLK_SEL;
-	}
-	__raw_writel(reg, MXC_CCM_CBCMR);
-
-	return 0;
-}
-
-static struct clk ipg_perclk = {
-	.name = "ipg_perclk",
-	.parent = &lp_apm_clk,
-	.recalc = _clk_ipg_per_recalc,
-	.set_parent = _clk_ipg_per_set_parent,
-	.flags = RATE_PROPAGATES,
-};
-
-static int _clk_ipmux_enable(struct clk *clk)
-{
-	u32 reg;
-	reg = __raw_readl(clk->enable_reg);
-	reg |= 1  << clk->enable_shift;
-	__raw_writel(reg, clk->enable_reg);
-
-	return 0;
-}
-
-static void _clk_ipmux_disable(struct clk *clk)
-{
-	u32 reg;
-	reg = __raw_readl(clk->enable_reg);
-	reg &= ~(0x1 << clk->enable_shift);
-	__raw_writel(reg, clk->enable_reg);
-}
-
-static struct clk ipumux1_clk = {
-	.name = "ipumux1",
-	.enable_reg = MXC_CCM_CCGR5,
-	.enable_shift = MXC_CCM_CCGR5_CG6_1_OFFSET,
-	.enable = _clk_ipmux_enable,
-	.disable = _clk_ipmux_disable,
-};
-
-static struct clk ipumux2_clk = {
-	.name = "ipumux2",
-	.enable_reg = MXC_CCM_CCGR5,
-	.enable_shift = MXC_CCM_CCGR5_CG6_2_OFFSET,
-	.enable = _clk_ipmux_enable,
-	.disable = _clk_ipmux_disable,
-};
-
-
-static struct clk aips_tz1_clk = {
-	.name = "aips_tz1_clk",
-	.parent = &ahb_clk,
-	.secondary = &ahb_max_clk,
-	.enable_reg = MXC_CCM_CCGR0,
-	.enable_shift = MXC_CCM_CCGR0_CG12_OFFSET,
-	.enable = _clk_enable,
-	.disable = _clk_disable_inwait,
-};
-
-static struct clk aips_tz2_clk = {
-	.name = "aips_tz2_clk",
-	.parent = &ahb_clk,
-	.secondary = &ahb_max_clk,
-	.enable_reg = MXC_CCM_CCGR0,
-	.enable_shift = MXC_CCM_CCGR0_CG13_OFFSET,
-	.enable = _clk_enable,
-	.disable = _clk_disable_inwait,
-};
-
-static struct clk gpc_dvfs_clk = {
-	.name = "gpc_dvfs_clk",
-	.enable_reg = MXC_CCM_CCGR5,
-	.enable_shift = MXC_CCM_CCGR5_CG12_OFFSET,
-	.enable = _clk_enable,
-	.disable = _clk_disable,
-};
-
-static int _clk_sdma_enable(struct clk *clk)
-{
-	u32 reg;
-
-	_clk_enable(clk);
-
-	/* Handshake with SDMA when LPM is entered. */
-	reg = __raw_readl(MXC_CCM_CLPCR);
-	reg &= ~MXC_CCM_CLPCR_BYPASS_SDMA_LPM_HS;
-	__raw_writel(reg, MXC_CCM_CLPCR);
-
-	return 0;
-}
-
-static void _clk_sdma_disable(struct clk *clk)
-{
-	u32 reg;
-
-	_clk_disable(clk);
-	/* No handshake with SDMA as its not enabled. */
-	reg = __raw_readl(MXC_CCM_CLPCR);
-	reg |= MXC_CCM_CLPCR_BYPASS_SDMA_LPM_HS;
-	__raw_writel(reg, MXC_CCM_CLPCR);
-}
-
-
-static struct clk sdma_clk[] = {
-	{
-	 .name = "sdma_ahb_clk",
-	 .parent = &ahb_clk,
-	 .enable_reg = MXC_CCM_CCGR4,
-	 .enable_shift = MXC_CCM_CCGR4_CG15_OFFSET,
-	 .enable = _clk_sdma_enable,
-	 .disable = _clk_sdma_disable,
-	 },
-	{
-	 .name = "sdma_ipg_clk",
-	 .parent = &ipg_clk,
-#ifdef CONFIG_SDMA_IRAM
-	 .secondary = &emi_intr_clk,
-#endif
-	 },
-};
-
-static int _clk_ipu_enable(struct clk *clk)
-{
-	u32 reg;
-
-	_clk_enable(clk);
-	/* Handshake with IPU when certain clock rates are changed. */
-	reg = __raw_readl(MXC_CCM_CCDR);
-	reg &= ~MXC_CCM_CCDR_IPU_HS_MASK;
-	__raw_writel(reg, MXC_CCM_CCDR);
-
-	/* Handshake with IPU when LPM is entered as its enabled. */
-	reg = __raw_readl(MXC_CCM_CLPCR);
-	reg &= ~MXC_CCM_CLPCR_BYPASS_IPU_LPM_HS;
-	__raw_writel(reg, MXC_CCM_CLPCR);
-
-	start_sdram_autogating();
-
-	return 0;
-}
-
-static void _clk_ipu_disable(struct clk *clk)
-{
-	u32 reg;
-
-	if (sdram_autogating_active())
-		stop_sdram_autogating();
-
-	_clk_disable(clk);
-
-	/* No handshake with IPU whe dividers are changed
-	 * as its not enabled. */
-	reg = __raw_readl(MXC_CCM_CCDR);
-	reg |= MXC_CCM_CCDR_IPU_HS_MASK;
-	__raw_writel(reg, MXC_CCM_CCDR);
-
-	/* No handshake with IPU when LPM is entered as its not enabled. */
-	reg = __raw_readl(MXC_CCM_CLPCR);
-	reg |= MXC_CCM_CLPCR_BYPASS_IPU_LPM_HS;
-	__raw_writel(reg, MXC_CCM_CLPCR);
-}
-
-static int _clk_ipu_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-	reg = __raw_readl(MXC_CCM_CBCMR);
-	mux = _get_mux(parent, &axi_a_clk, &axi_b_clk, &ahb_clk,
-		       &emi_slow_clk);
-	reg = (reg & ~MXC_CCM_CBCMR_IPU_HSP_CLK_SEL_MASK) |
-	    (mux << MXC_CCM_CBCMR_IPU_HSP_CLK_SEL_OFFSET);
-	__raw_writel(reg, MXC_CCM_CBCMR);
-
-	return 0;
-}
-
-
-static struct clk ipu_clk[] = {
-	{
-	.name = "ipu_clk",
-	.parent = &ahb_clk,
-	.secondary = &ipu_clk[1],
-	.enable_reg = MXC_CCM_CCGR5,
-	.enable_shift = MXC_CCM_CCGR5_CG5_OFFSET,
-	.enable = _clk_ipu_enable,
-	.disable = _clk_ipu_disable,
-	.set_parent = _clk_ipu_set_parent,
-	 .flags = CPU_FREQ_TRIG_UPDATE | AHB_MED_SET_POINT | RATE_PROPAGATES,
-	},
-	{
-	 .name = "ipu_sec_clk",
-	 .parent = &emi_fast_clk,
-	 .secondary = &ahbmux1_clk,
-	}
-};
-
-static int _clk_ipu_di_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg;
-
-	reg = __raw_readl(MXC_CCM_CSCMR2);
-	reg &= ~MXC_CCM_CSCMR2_DI_CLK_SEL_MASK(clk->id);
-	if (parent == &pll3_sw_clk)
-		;
-	else if (parent == &osc_clk)
-		reg |= 1 << MXC_CCM_CSCMR2_DI_CLK_SEL_OFFSET(clk->id);
-	else if (parent == &ckih_clk)
-		reg |= 2 << MXC_CCM_CSCMR2_DI_CLK_SEL_OFFSET(clk->id);
-	else if (parent == &tve_clk)
-		reg |= 3 << MXC_CCM_CSCMR2_DI_CLK_SEL_OFFSET(clk->id);
-	else		/* Assume any other clock is external clock pin */
-		reg |= 4 << MXC_CCM_CSCMR2_DI_CLK_SEL_OFFSET(clk->id);
-	__raw_writel(reg, MXC_CCM_CSCMR2);
-
-	return 0;
-}
-
-static void _clk_ipu_di_recalc(struct clk *clk)
-{
-	u32 reg, div, mux;
-
-	reg = __raw_readl(MXC_CCM_CSCMR2);
-	mux = (reg & MXC_CCM_CSCMR2_DI_CLK_SEL_MASK(clk->id)) >>
-		MXC_CCM_CSCMR2_DI_CLK_SEL_OFFSET(clk->id);
-	if (mux == 0) {
-		reg = __raw_readl(MXC_CCM_CDCDR) &
-		    MXC_CCM_CDCDR_DI_CLK_PRED_MASK;
-		div = (reg >> MXC_CCM_CDCDR_DI_CLK_PRED_OFFSET) + 1;
-		clk->rate = clk->parent->rate / div;
-	} else if (mux == 3) {
-		clk->rate = clk->parent->rate / 8;
-	} else {
-		clk->rate = clk->parent->rate;
-	}
-}
-
-static int _clk_ipu_di_set_rate(struct clk *clk, unsigned long rate)
-{
-	u32 reg, div;
-
-	div = clk->parent->rate / rate;
-	if (div == 0)
-		div++;
-	if (((clk->parent->rate / div) != rate) || (div > 8))
-		return -EINVAL;
-
-	reg = __raw_readl(MXC_CCM_CDCDR);
-	reg &= ~MXC_CCM_CDCDR_DI_CLK_PRED_MASK;
-	reg |= (div - 1) << MXC_CCM_CDCDR_DI_CLK_PRED_OFFSET;
-	__raw_writel(reg, MXC_CCM_CDCDR);
-
-	clk->rate = rate;
-
-	return 0;
-}
-
-static unsigned long _clk_ipu_di_round_rate(struct clk *clk,
-					    unsigned long rate)
-{
-	u32 div;
-
-	div = clk->parent->rate / rate;
-	if (div > 8)
-		div = 8;
-	else if (div == 0)
-		div++;
-	return clk->parent->rate / div;
-}
-
-static struct clk ipu_di_clk[] = {
-	{
-	.name = "ipu_di0_clk",
-	.id = 0,
-	.parent = &pll3_sw_clk,
-	.enable_reg = MXC_CCM_CCGR6,
-	.enable_shift = MXC_CCM_CCGR6_CG5_OFFSET,
-	.recalc = _clk_ipu_di_recalc,
-	.set_parent = _clk_ipu_di_set_parent,
-	.round_rate = _clk_ipu_di_round_rate,
-	.set_rate = _clk_ipu_di_set_rate,
-	.enable = _clk_enable,
-	.disable = _clk_disable,
-	.flags = RATE_PROPAGATES,
-	},
-	{
-	.name = "ipu_di1_clk",
-	.id = 1,
-	.parent = &pll3_sw_clk,
-	.enable_reg = MXC_CCM_CCGR6,
-	.enable_shift = MXC_CCM_CCGR6_CG6_OFFSET,
-	.recalc = _clk_ipu_di_recalc,
-	.set_parent = _clk_ipu_di_set_parent,
-	.round_rate = _clk_ipu_di_round_rate,
-	.set_rate = _clk_ipu_di_set_rate,
-	.enable = _clk_enable,
-	.disable = _clk_disable,
-	.flags = RATE_PROPAGATES,
-	},
-};
-
-static int _clk_csi0_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-
-	reg = __raw_readl(MXC_CCM_CSCMR2);
-	mux = _get_mux(parent, &pll1_sw_clk, &pll2_sw_clk, &pll3_sw_clk, NULL);
-	reg = (reg & ~MXC_CCM_CSCMR2_CSI_MCLK1_CLK_SEL_MASK) |
-		    (mux << MXC_CCM_CSCMR2_CSI_MCLK1_CLK_SEL_OFFSET);
-	__raw_writel(reg, MXC_CCM_CSCMR2);
-
-	return 0;
-}
-
-static void _clk_csi0_recalc(struct clk *clk)
-{
-	u32 reg, pred, podf;
-
-	reg = __raw_readl(MXC_CCM_CSCDR4);
-	pred = ((reg & MXC_CCM_CSCDR4_CSI_MCLK1_CLK_PRED_MASK) >>
-			MXC_CCM_CSCDR4_CSI_MCLK1_CLK_PRED_OFFSET) + 1;
-	podf = ((reg & MXC_CCM_CSCDR4_CSI_MCLK1_CLK_PODF_MASK) >>
-			MXC_CCM_CSCDR4_CSI_MCLK1_CLK_PODF_OFFSET) + 1;
-	clk->rate = clk->parent->rate / (pred * podf);
-}
-
-static unsigned long _clk_csi0_round_rate(struct clk *clk, unsigned long rate)
-{
-	u32 pre, post;
-	u32 div = clk->parent->rate / rate;
-	if (clk->parent->rate % rate)
-		div++;
-
-	__calc_pre_post_dividers(div, &pre, &post);
-
-	return clk->parent->rate / (pre * post);
-}
-
-static int _clk_csi0_set_rate(struct clk *clk, unsigned long rate)
-{
-	u32 reg;
-	u32 div;
-	u32 pre, post;
-
-	div = clk->parent->rate / rate;
-
-	if ((clk->parent->rate / div) != rate)
-		return -EINVAL;
-
-	__calc_pre_post_dividers(div, &pre, &post);
-
-	/* Set CSI clock divider */
-	reg = __raw_readl(MXC_CCM_CSCDR4) &
-	    ~(MXC_CCM_CSCDR4_CSI_MCLK1_CLK_PRED_MASK |
-		MXC_CCM_CSCDR4_CSI_MCLK1_CLK_PODF_MASK);
-	reg |= (post - 1) << MXC_CCM_CSCDR4_CSI_MCLK1_CLK_PODF_OFFSET;
-	reg |= (pre - 1) << MXC_CCM_CSCDR4_CSI_MCLK1_CLK_PRED_OFFSET;
-	__raw_writel(reg, MXC_CCM_CSCDR4);
-
-	clk->rate = rate;
-	return 0;
-}
-
-static struct clk csi0_clk = {
-	.name = "csi_mclk1",
-	.parent = &pll3_sw_clk,
-	.set_parent = _clk_csi0_set_parent,
-	.recalc = _clk_csi0_recalc,
-	.round_rate = _clk_csi0_round_rate,
-	.set_rate = _clk_csi0_set_rate,
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR6,
-	.enable_shift = MXC_CCM_CCGR6_CG2_OFFSET,
-	.disable = _clk_disable,
-};
-
-static int _clk_csi1_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-
-	reg = __raw_readl(MXC_CCM_CSCMR2);
-	mux = _get_mux(parent, &pll1_sw_clk, &pll2_sw_clk, &pll3_sw_clk, NULL);
-	reg = (reg & ~MXC_CCM_CSCMR2_CSI_MCLK2_CLK_SEL_MASK) |
-		    (mux << MXC_CCM_CSCMR2_CSI_MCLK2_CLK_SEL_OFFSET);
-	__raw_writel(reg, MXC_CCM_CSCMR2);
-
-	return 0;
-}
-
-static void _clk_csi1_recalc(struct clk *clk)
-{
-	u32 reg, pred, podf;
-
-	reg = __raw_readl(MXC_CCM_CSCDR4);
-	pred = ((reg & MXC_CCM_CSCDR4_CSI_MCLK2_CLK_PRED_MASK) >>
-			MXC_CCM_CSCDR4_CSI_MCLK2_CLK_PRED_OFFSET) + 1;
-	podf = ((reg & MXC_CCM_CSCDR4_CSI_MCLK2_CLK_PODF_MASK) >>
-			MXC_CCM_CSCDR4_CSI_MCLK2_CLK_PODF_OFFSET) + 1;
-	clk->rate = clk->parent->rate / (pred * podf);
-}
-
-static unsigned long _clk_csi1_round_rate(struct clk *clk, unsigned long rate)
-{
-	u32 pre, post;
-	u32 div = clk->parent->rate / rate;
-	if (clk->parent->rate % rate)
-		div++;
-
-	__calc_pre_post_dividers(div, &pre, &post);
-
-	return clk->parent->rate / (pre * post);
-}
-
-static int _clk_csi1_set_rate(struct clk *clk, unsigned long rate)
-{
-	u32 reg;
-	u32 div;
-	u32 pre, post;
-
-	div = clk->parent->rate / rate;
-
-	if ((clk->parent->rate / div) != rate)
-		return -EINVAL;
-
-	__calc_pre_post_dividers(div, &pre, &post);
-
-	/* Set CSI clock divider */
-	reg = __raw_readl(MXC_CCM_CSCDR4) &
-	    ~(MXC_CCM_CSCDR4_CSI_MCLK2_CLK_PRED_MASK |
-		MXC_CCM_CSCDR4_CSI_MCLK2_CLK_PODF_MASK);
-	reg |= (post - 1) << MXC_CCM_CSCDR4_CSI_MCLK2_CLK_PODF_OFFSET;
-	reg |= (pre - 1) << MXC_CCM_CSCDR4_CSI_MCLK2_CLK_PRED_OFFSET;
-	__raw_writel(reg, MXC_CCM_CSCDR4);
-
-	clk->rate = rate;
-	return 0;
-}
-
-static struct clk csi1_clk = {
-	.name = "csi_mclk2",
-	.parent = &pll3_sw_clk,
-	.set_parent = _clk_csi1_set_parent,
-	.recalc = _clk_csi1_recalc,
-	.round_rate = _clk_csi1_round_rate,
-	.set_rate = _clk_csi1_set_rate,
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR6,
-	.enable_shift = MXC_CCM_CCGR6_CG3_OFFSET,
-	.disable = _clk_disable,
-};
-
-
-static int _clk_hsc_enable(struct clk *clk)
-{
-	u32 reg;
-
-	_clk_enable(clk);
-	/* Handshake with IPU when certain clock rates are changed. */
-	reg = __raw_readl(MXC_CCM_CCDR);
-	reg &= ~MXC_CCM_CCDR_HSC_HS_MASK;
-	__raw_writel(reg, MXC_CCM_CCDR);
-
-	reg = __raw_readl(MXC_CCM_CLPCR);
-	reg &= ~MXC_CCM_CLPCR_BYPASS_HSC_LPM_HS;
-	__raw_writel(reg, MXC_CCM_CLPCR);
-
-	return 0;
-}
-
-static void _clk_hsc_disable(struct clk *clk)
-{
-	u32 reg;
-
-	_clk_disable(clk);
-	/* No handshake with HSC as its not enabled. */
-	reg = __raw_readl(MXC_CCM_CCDR);
-	reg |= MXC_CCM_CCDR_HSC_HS_MASK;
-	__raw_writel(reg, MXC_CCM_CCDR);
-
-	reg = __raw_readl(MXC_CCM_CLPCR);
-	reg |= MXC_CCM_CLPCR_BYPASS_HSC_LPM_HS;
-	__raw_writel(reg, MXC_CCM_CLPCR);
-}
-
-static struct clk mipi_esc_clk = {
-	.name = "mipi_esc_clk",
-	.parent = &pll2_sw_clk,
-	.enable_reg = MXC_CCM_CCGR4,
-	.enable_shift = MXC_CCM_CCGR4_CG5_OFFSET,
-};
-
-static struct clk mipi_hsc2_clk = {
-	.name = "mipi_hsc2_clk",
-	.parent = &pll2_sw_clk,
-	.enable_reg = MXC_CCM_CCGR4,
-	.enable_shift = MXC_CCM_CCGR4_CG4_OFFSET,
-	.secondary = &mipi_esc_clk,
-};
-
-static struct clk mipi_hsc1_clk = {
-	.name = "mipi_hsc1_clk",
-	.parent = &pll2_sw_clk,
-	.enable_reg = MXC_CCM_CCGR4,
-	.enable_shift = MXC_CCM_CCGR4_CG3_OFFSET,
-	.secondary = &mipi_hsc2_clk,
-};
-
-static struct clk mipi_hsp_clk = {
-	.name = "mipi_hsp_clk",
-	.parent = &ipu_clk[0],
-	.enable_reg = MXC_CCM_CCGR4,
-	.enable_shift = MXC_CCM_CCGR4_CG6_OFFSET,
-	.enable = _clk_hsc_enable,
-	.disable = _clk_hsc_disable,
-	.secondary = &mipi_hsc1_clk,
-};
-
-static int _clk_tve_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg;
-
-	reg = __raw_readl(MXC_CCM_CSCMR1);
-
-	if (parent == &pll3_sw_clk) {
-		reg &= ~(MXC_CCM_CSCMR1_TVE_CLK_SEL);
-	} else if (parent == &osc_clk) {
-		reg |= MXC_CCM_CSCMR1_TVE_CLK_SEL;
-		reg &= MXC_CCM_CSCMR1_TVE_EXT_CLK_SEL;
-	} else if (parent == &ckih_clk) {
-		reg |= MXC_CCM_CSCMR1_TVE_CLK_SEL;
-		reg |= MXC_CCM_CSCMR1_TVE_EXT_CLK_SEL;
-	} else {
-		BUG();
-	}
-
-	__raw_writel(reg, MXC_CCM_CSCMR1);
-	return 0;
-}
-
-static void _clk_tve_recalc(struct clk *clk)
-{
-	u32 reg, div;
-
-	reg = __raw_readl(MXC_CCM_CSCMR1);
-	if ((reg & MXC_CCM_CSCMR1_TVE_CLK_SEL) == 0) {
-		reg = __raw_readl(MXC_CCM_CDCDR) &
-		    MXC_CCM_CDCDR_TVE_CLK_PRED_MASK;
-		div = (reg >> MXC_CCM_CDCDR_TVE_CLK_PRED_OFFSET) + 1;
-		clk->rate = clk->parent->rate / div;
-	} else {
-		clk->rate = clk->parent->rate;
-	}
-}
-
-static unsigned long _clk_tve_round_rate(struct clk *clk,
-						unsigned long rate)
-{
-	u32 reg, div;
-
-	reg = __raw_readl(MXC_CCM_CSCMR1);
-	if (reg & MXC_CCM_CSCMR1_TVE_CLK_SEL)
-		return -EINVAL;
-
-	div = clk->parent->rate / rate;
-	if (div > 8)
-		div = 8;
-	else if (div == 0)
-		div++;
-	return clk->parent->rate / div;
-}
-
-static int _clk_tve_set_rate(struct clk *clk, unsigned long rate)
-{
-	u32 reg, div;
-
-	reg = __raw_readl(MXC_CCM_CSCMR1);
-	if (reg & MXC_CCM_CSCMR1_TVE_CLK_SEL)
-		return -EINVAL;
-
-	div = clk->parent->rate / rate;
-	if (div == 0)
-		div++;
-	if (((clk->parent->rate / div) != rate) || (div > 8))
-		return -EINVAL;
-
-	div--;
-	reg = __raw_readl(MXC_CCM_CDCDR) & ~MXC_CCM_CDCDR_TVE_CLK_PRED_MASK;
-	reg |= div << MXC_CCM_CDCDR_TVE_CLK_PRED_OFFSET;
-	__raw_writel(reg, MXC_CCM_CDCDR);
-	clk->rate = rate;
-	return 0;
-}
-
-static int _clk_tve_enable(struct clk *clk)
-{
-	_clk_enable(clk);
-	if (clk_get_parent(&ipu_di_clk[1]) != clk) {
-		clk_enable(&ipu_di_clk[1]);
-		ipu_di_clk[1].set_parent(&ipu_di_clk[1], clk);
-		ipu_di_clk[1].parent = clk;
-	}
-	return 0;
-}
-
-static void _clk_tve_disable(struct clk *clk)
-{
-	_clk_disable(clk);
-	if (clk_get_parent(&ipu_di_clk[1]) == clk) {
-		ipu_di_clk[1].set_parent(&ipu_di_clk[1], &pll3_sw_clk);
-		ipu_di_clk[1].parent = &pll3_sw_clk;
-		clk_disable(&ipu_di_clk[1]);
-	}
-}
-
-static struct clk tve_clk = {
-	.name = "tve_clk",
-	.parent = &pll3_sw_clk,
-	.set_parent = _clk_tve_set_parent,
-	.enable_reg = MXC_CCM_CCGR2,
-	.enable_shift = MXC_CCM_CCGR2_CG15_OFFSET,
-	.recalc = _clk_tve_recalc,
-	.round_rate = _clk_tve_round_rate,
-	.set_rate = _clk_tve_set_rate,
-	.enable = _clk_tve_enable,
-	.disable = _clk_tve_disable,
-	.flags = AHB_HIGH_SET_POINT | CPU_FREQ_TRIG_UPDATE,
-};
-
-static struct clk spba_clk = {
-	.name = "spba_clk",
-	.parent = &ipg_clk,
-	.enable_reg = MXC_CCM_CCGR5,
-	.enable_shift = MXC_CCM_CCGR5_CG0_OFFSET,
-	.enable = _clk_enable,
-	.disable = _clk_disable,
-};
-
-static void _clk_uart_recalc(struct clk *clk)
-{
-	u32 reg, prediv, podf;
-
-	reg = __raw_readl(MXC_CCM_CSCDR1);
-	prediv = ((reg & MXC_CCM_CSCDR1_UART_CLK_PRED_MASK) >>
-		  MXC_CCM_CSCDR1_UART_CLK_PRED_OFFSET) + 1;
-	podf = ((reg & MXC_CCM_CSCDR1_UART_CLK_PODF_MASK) >>
-		MXC_CCM_CSCDR1_UART_CLK_PODF_OFFSET) + 1;
-
-	clk->rate = clk->parent->rate / (prediv * podf);
-}
-
-static int _clk_uart_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-
-	mux = _get_mux(parent, &pll1_sw_clk, &pll2_sw_clk, &pll3_sw_clk,
-		       &lp_apm_clk);
-	reg = __raw_readl(MXC_CCM_CSCMR1) & ~MXC_CCM_CSCMR1_UART_CLK_SEL_MASK;
-	reg |= mux << MXC_CCM_CSCMR1_UART_CLK_SEL_OFFSET;
-	__raw_writel(reg, MXC_CCM_CSCMR1);
-
-	return 0;
-}
-
-static struct clk uart_main_clk = {
-	.name = "uart_main_clk",
-	.parent = &pll2_sw_clk,
-	.recalc = _clk_uart_recalc,
-	.set_parent = _clk_uart_set_parent,
-	.flags = RATE_PROPAGATES,
-};
-
-static struct clk uart1_clk[] = {
-	{
-	 .name = "uart_clk",
-	 .id = 0,
-	 .parent = &uart_main_clk,
-	 .secondary = &uart1_clk[1],
-	 .enable_reg = MXC_CCM_CCGR1,
-	 .enable_shift = MXC_CCM_CCGR1_CG4_OFFSET,
-	 .enable = _clk_enable,
-	 .disable = _clk_disable,
-#ifdef UART1_DMA_ENABLE
-	.flags = AHB_HIGH_SET_POINT | CPU_FREQ_TRIG_UPDATE,
-#endif
-	 },
-	{
-	 .name = "uart_ipg_clk",
-	 .id = 0,
-	 .parent = &ipg_clk,
-#ifdef UART1_DMA_ENABLE
-	 .secondary = &aips_tz1_clk,
-#endif
-	 .enable_reg = MXC_CCM_CCGR1,
-	 .enable_shift = MXC_CCM_CCGR1_CG3_OFFSET,
-	 .enable = _clk_enable,
-	 .disable = _clk_disable,
-	 },
-};
-
-static struct clk uart2_clk[] = {
-	{
-	 .name = "uart_clk",
-	 .id = 1,
-	 .parent = &uart_main_clk,
-	 .secondary = &uart2_clk[1],
-	 .enable_reg = MXC_CCM_CCGR1,
-	 .enable_shift = MXC_CCM_CCGR1_CG6_OFFSET,
-	 .enable = _clk_enable,
-	 .disable = _clk_disable,
-#ifdef UART2_DMA_ENABLE
-	.flags = AHB_HIGH_SET_POINT | CPU_FREQ_TRIG_UPDATE,
-#endif
-	 },
-	{
-	 .name = "uart_ipg_clk",
-	 .id = 1,
-	 .parent = &ipg_clk,
-#ifdef UART2_DMA_ENABLE
-	 .secondary = &aips_tz1_clk,
-#endif
-	 .enable_reg = MXC_CCM_CCGR1,
-	 .enable_shift = MXC_CCM_CCGR1_CG5_OFFSET,
-	 .enable = _clk_enable,
-	 .disable = _clk_disable,
-	 },
-};
-
-static struct clk uart3_clk[] = {
-	{
-	 .name = "uart_clk",
-	 .id = 2,
-	 .parent = &uart_main_clk,
-	 .secondary = &uart3_clk[1],
-	 .enable_reg = MXC_CCM_CCGR1,
-	 .enable_shift = MXC_CCM_CCGR1_CG8_OFFSET,
-	 .enable = _clk_enable,
-	 .disable = _clk_disable,
-#ifdef UART3_DMA_ENABLE
-	.flags = AHB_HIGH_SET_POINT | CPU_FREQ_TRIG_UPDATE,
-#endif
-	 },
-	{
-	 .name = "uart_ipg_clk",
-	 .id = 2,
-	 .parent = &ipg_clk,
-	 .secondary = &spba_clk,
-	 .enable_reg = MXC_CCM_CCGR1,
-	 .enable_shift = MXC_CCM_CCGR1_CG7_OFFSET,
-	 .enable = _clk_enable,
-	 .disable = _clk_disable,
-	 },
-};
-
-static struct clk gpt_clk[] = {
-	{
-	 .name = "gpt_clk",
-	 .parent = &ipg_perclk,
-	 .id = 0,
-	 .enable_reg = MXC_CCM_CCGR2,
-	 .enable_shift = MXC_CCM_CCGR2_CG9_OFFSET,
-	 .enable = _clk_enable,
-	 .disable = _clk_disable,
-	 .secondary = &gpt_clk[1],
-	 },
-	{
-	 .name = "gpt_ipg_clk",
-	 .id = 0,
-	 .parent = &ipg_clk,
-	 .enable_reg = MXC_CCM_CCGR2,
-	 .enable_shift = MXC_CCM_CCGR2_CG10_OFFSET,
-	 .enable = _clk_enable,
-	 .disable = _clk_disable,
-	 },
-	{
-	 .name = "gpt_32k_clk",
-	 .id = 0,
-	 .parent = &ckil_clk,
-	 },
-};
-
-static struct clk pwm1_clk[] = {
-	{
-	 .name = "pwm",
-	 .parent = &ipg_perclk,
-	 .id = 0,
-	 .enable_reg = MXC_CCM_CCGR2,
-	 .enable_shift = MXC_CCM_CCGR2_CG6_OFFSET,
-	 .enable = _clk_enable,
-	 .disable = _clk_disable,
-	 .secondary = &pwm1_clk[1],
-	 },
-	{
-	 .name = "pwm_ipg_clk",
-	 .id = 0,
-	 .parent = &ipg_clk,
-	 .enable_reg = MXC_CCM_CCGR2,
-	 .enable_shift = MXC_CCM_CCGR2_CG5_OFFSET,
-	 .enable = _clk_enable_inrun, /*Active only when ARM is running. */
-	 .disable = _clk_disable,
-	 },
-	{
-	 .name = "pwm_32k_clk",
-	 .id = 0,
-	 .parent = &ckil_clk,
-	 },
-};
-
-static struct clk pwm2_clk[] = {
-	{
-	 .name = "pwm",
-	 .parent = &ipg_perclk,
-	 .id = 1,
-	 .enable_reg = MXC_CCM_CCGR2,
-	 .enable_shift = MXC_CCM_CCGR2_CG8_OFFSET,
-	 .enable = _clk_enable,
-	 .disable = _clk_disable,
-	 .secondary = &pwm2_clk[1],
-	 },
-	{
-	 .name = "pwm_ipg_clk",
-	 .id = 1,
-	 .parent = &ipg_clk,
-	 .enable_reg = MXC_CCM_CCGR2,
-	 .enable_shift = MXC_CCM_CCGR2_CG7_OFFSET,
-	 .enable = _clk_enable_inrun, /*Active only when ARM is running. */
-	 .disable = _clk_disable,
-	 },
-	{
-	 .name = "pwm_32k_clk",
-	 .id = 1,
-	 .parent = &ckil_clk,
-	 },
-};
-
-static struct clk i2c_clk[] = {
-	{
-	 .name = "i2c_clk",
-	 .id = 0,
-	 .parent = &ipg_perclk,
-	 .enable_reg = MXC_CCM_CCGR1,
-	 .enable_shift = MXC_CCM_CCGR1_CG9_OFFSET,
-	 .enable = _clk_enable,
-	 .disable = _clk_disable,
-	 },
-	{
-	 .name = "i2c_clk",
-	 .id = 1,
-	 .parent = &ipg_perclk,
-	 .enable_reg = MXC_CCM_CCGR1,
-	 .enable_shift = MXC_CCM_CCGR1_CG10_OFFSET,
-	 .enable = _clk_enable,
-	 .disable = _clk_disable,
-	 },
-};
-
-static void _clk_hsi2c_serial_recalc(struct clk *clk)
-{
-	u32 reg, prediv, podf;
-
-	reg = __raw_readl(MXC_CCM_CSCDR3);
-	prediv = ((reg & MXC_CCM_CSCDR3_HSI2C_CLK_PRED_MASK) >>
-		  MXC_CCM_CSCDR3_HSI2C_CLK_PRED_OFFSET) + 1;
-	podf = ((reg & MXC_CCM_CSCDR3_HSI2C_CLK_PODF_MASK) >>
-		MXC_CCM_CSCDR3_HSI2C_CLK_PODF_OFFSET) + 1;
-
-	clk->rate = clk->parent->rate / (prediv * podf);
-}
-
-static struct clk hsi2c_serial_clk = {
-	.name = "hsi2c_serial_clk",
-	.id = 0,
-	.parent = &pll3_sw_clk,
-	.secondary = &spba_clk,
-	.enable_reg = MXC_CCM_CCGR1,
-	.enable_shift = MXC_CCM_CCGR1_CG11_OFFSET,
-	.recalc = _clk_hsi2c_serial_recalc,
-	.enable = _clk_enable,
-	.disable = _clk_disable,
-};
-
-static struct clk hsi2c_clk = {
-	.name = "hsi2c_clk",
-	.id = 0,
-	.parent = &ipg_clk,
-	.enable_reg = MXC_CCM_CCGR1,
-	.enable_shift = MXC_CCM_CCGR1_CG12_OFFSET,
-	.enable = _clk_enable,
-	.disable = _clk_disable,
-	.flags = AHB_HIGH_SET_POINT | CPU_FREQ_TRIG_UPDATE,
-};
-
-static void _clk_cspi_recalc(struct clk *clk)
-{
-	u32 reg, prediv, podf;
-
-	reg = __raw_readl(MXC_CCM_CSCDR2);
-	prediv = ((reg & MXC_CCM_CSCDR2_CSPI_CLK_PRED_MASK) >>
-		  MXC_CCM_CSCDR2_CSPI_CLK_PRED_OFFSET) + 1;
-	if (prediv == 1)
-		BUG();
-	podf = ((reg & MXC_CCM_CSCDR2_CSPI_CLK_PODF_MASK) >>
-		MXC_CCM_CSCDR2_CSPI_CLK_PODF_OFFSET) + 1;
-
-	clk->rate = clk->parent->rate / (prediv * podf);
-}
-
-static int _clk_cspi_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-
-	mux = _get_mux(parent, &pll1_sw_clk, &pll2_sw_clk, &pll3_sw_clk,
-		       &lp_apm_clk);
-	reg = __raw_readl(MXC_CCM_CSCMR1) & ~MXC_CCM_CSCMR1_CSPI_CLK_SEL_MASK;
-	reg |= mux << MXC_CCM_CSCMR1_CSPI_CLK_SEL_OFFSET;
-	__raw_writel(reg, MXC_CCM_CSCMR1);
-
-	return 0;
-}
-
-static struct clk cspi_main_clk = {
-	.name = "cspi_main_clk",
-	.parent = &pll3_sw_clk,
-	.recalc = _clk_cspi_recalc,
-	.set_parent = _clk_cspi_set_parent,
-	.flags = RATE_PROPAGATES,
-};
-
-static struct clk cspi1_clk[] = {
-	{
-	 .name = "cspi_clk",
-	 .id = 0,
-	 .parent = &cspi_main_clk,
-	 .secondary = &cspi1_clk[1],
-	 .enable_reg = MXC_CCM_CCGR4,
-	 .enable_shift = MXC_CCM_CCGR4_CG10_OFFSET,
-	 .enable = _clk_enable,
-	 .disable = _clk_disable,
-	 },
-	{
-	 .name = "cspi_ipg_clk",
-	 .id = 0,
-	 .parent = &ipg_clk,
-	 .secondary = &spba_clk,
-	 .enable_reg = MXC_CCM_CCGR4,
-	 .enable_shift = MXC_CCM_CCGR4_CG9_OFFSET,
-	 .enable = _clk_enable_inrun, /*Active only when ARM is running. */
-	 .disable = _clk_disable,
-	 },
-};
-
-static struct clk cspi2_clk[] = {
-	{
-	 .name = "cspi_clk",
-	 .id = 1,
-	 .parent = &cspi_main_clk,
-	 .secondary = &cspi2_clk[1],
-	 .enable_reg = MXC_CCM_CCGR4,
-	 .enable_shift = MXC_CCM_CCGR4_CG12_OFFSET,
-	 .enable = _clk_enable,
-	 .disable = _clk_disable,
-	 },
-	{
-	 .name = "cspi_ipg_clk",
-	 .id = 1,
-	 .parent = &ipg_clk,
-	 .secondary = &aips_tz2_clk,
-	 .enable_reg = MXC_CCM_CCGR4,
-	 .enable_shift = MXC_CCM_CCGR4_CG11_OFFSET,
-	 .enable = _clk_enable_inrun, /*Active only when ARM is running. */
-	 .disable = _clk_disable,
-	 },
-};
-
-static struct clk cspi3_clk[] = {
-	{
-	 .name = "cspi_clk",
-	 .id = 2,
-	 .parent = &cspi_main_clk,
-	 .enable_reg = MXC_CCM_CCGR4,
-	 .enable_shift = MXC_CCM_CCGR4_CG13_OFFSET,
-	 .enable = _clk_enable,
-	 .disable = _clk_disable,
-	 .secondary = &cspi3_clk[1],
-	 },
-	{
-	 .name = "cspi_ipg_clk",
-	 .id = 2,
-	 .parent = &ipg_clk,
-	 .secondary = &aips_tz2_clk,
-	 },
-};
-
-static int _clk_ssi_lp_apm_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-
-	mux = _get_mux(parent, &ckih_clk, &lp_apm_clk, &ckih2_clk, NULL);
-	reg = __raw_readl(MXC_CCM_CSCMR1) &
-	    ~MXC_CCM_CSCMR1_SSI_APM_CLK_SEL_MASK;
-	reg |= mux << MXC_CCM_CSCMR1_SSI_APM_CLK_SEL_OFFSET;
-	__raw_writel(reg, MXC_CCM_CSCMR1);
-
-	return 0;
-}
-
-static struct clk ssi_lp_apm_clk = {
-	.name = "ssi_lp_apm_clk",
-	.parent = &ckih_clk,
-	.set_parent = _clk_ssi_lp_apm_set_parent,
-};
-
-static void _clk_ssi1_recalc(struct clk *clk)
-{
-	u32 reg, prediv, podf;
-
-	reg = __raw_readl(MXC_CCM_CS1CDR);
-	prediv = ((reg & MXC_CCM_CS1CDR_SSI1_CLK_PRED_MASK) >>
-		  MXC_CCM_CS1CDR_SSI1_CLK_PRED_OFFSET) + 1;
-	if (prediv == 1)
-		BUG();
-	podf = ((reg & MXC_CCM_CS1CDR_SSI1_CLK_PODF_MASK) >>
-		MXC_CCM_CS1CDR_SSI1_CLK_PODF_OFFSET) + 1;
-
-	clk->rate = clk->parent->rate / (prediv * podf);
-}
-static int _clk_ssi1_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-
-	mux = _get_mux(parent, &pll1_sw_clk, &pll2_sw_clk,
-		       &pll3_sw_clk, &ssi_lp_apm_clk);
-	reg = __raw_readl(MXC_CCM_CSCMR1) & ~MXC_CCM_CSCMR1_SSI1_CLK_SEL_MASK;
-	reg |= mux << MXC_CCM_CSCMR1_SSI1_CLK_SEL_OFFSET;
-	__raw_writel(reg, MXC_CCM_CSCMR1);
-
-	return 0;
-}
-
-static struct clk ssi1_clk[] = {
-	{
-	 .name = "ssi_clk",
-	 .id = 0,
-	 .parent = &pll3_sw_clk,
-	 .set_parent = _clk_ssi1_set_parent,
-	 .secondary = &ssi1_clk[1],
-	 .recalc = _clk_ssi1_recalc,
-	 .enable_reg = MXC_CCM_CCGR3,
-	 .enable_shift = MXC_CCM_CCGR3_CG9_OFFSET,
-	 .enable = _clk_enable,
-	 .disable = _clk_disable,
-	 },
-	{
-	 .name = "ssi_ipg_clk",
-	 .id = 0,
-	 .parent = &ipg_clk,
-	 .secondary = &ssi1_clk[2],
-	 .enable_reg = MXC_CCM_CCGR3,
-	 .enable_shift = MXC_CCM_CCGR3_CG8_OFFSET,
-	 .enable = _clk_enable,
-	 .disable = _clk_disable,
-	 },
-	{
-	 .name = "ssi_dep_clk",
-	 .id = 0,
-	 .parent = &aips_tz2_clk,
-#ifdef CONFIG_SND_MXC_SOC_IRAM
-	 .secondary = &emi_intr_clk,
-#else
-	 .secondary = &emi_fast_clk,
-#endif
-	 },
-};
-
-static void _clk_ssi2_recalc(struct clk *clk)
-{
-	u32 reg, prediv, podf;
-
-	reg = __raw_readl(MXC_CCM_CS2CDR);
-	prediv = ((reg & MXC_CCM_CS2CDR_SSI2_CLK_PRED_MASK) >>
-		  MXC_CCM_CS2CDR_SSI2_CLK_PRED_OFFSET) + 1;
-	if (prediv == 1)
-		BUG();
-	podf = ((reg & MXC_CCM_CS2CDR_SSI2_CLK_PODF_MASK) >>
-		MXC_CCM_CS2CDR_SSI2_CLK_PODF_OFFSET) + 1;
-
-	clk->rate = clk->parent->rate / (prediv * podf);
-}
-
-static int _clk_ssi2_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-
-	mux = _get_mux(parent, &pll1_sw_clk, &pll2_sw_clk,
-		       &pll3_sw_clk, &ssi_lp_apm_clk);
-	reg = __raw_readl(MXC_CCM_CSCMR1) & ~MXC_CCM_CSCMR1_SSI2_CLK_SEL_MASK;
-	reg |= mux << MXC_CCM_CSCMR1_SSI2_CLK_SEL_OFFSET;
-	__raw_writel(reg, MXC_CCM_CSCMR1);
-
-	return 0;
-}
-
-static struct clk ssi2_clk[] = {
-	{
-	 .name = "ssi_clk",
-	 .id = 1,
-	 .parent = &pll3_sw_clk,
-	 .set_parent = _clk_ssi2_set_parent,
-	 .secondary = &ssi2_clk[1],
-	 .recalc = _clk_ssi2_recalc,
-	 .enable_reg = MXC_CCM_CCGR3,
-	 .enable_shift = MXC_CCM_CCGR3_CG11_OFFSET,
-	 .enable = _clk_enable,
-	 .disable = _clk_disable,
-	 },
-	{
-	 .name = "ssi_ipg_clk",
-	 .id = 1,
-	 .parent = &ipg_clk,
-	 .secondary = &ssi2_clk[2],
-	 .enable_reg = MXC_CCM_CCGR3,
-	 .enable_shift = MXC_CCM_CCGR3_CG10_OFFSET,
-	 .enable = _clk_enable,
-	 .disable = _clk_disable,
-	 },
-	{
-	 .name = "ssi_dep_clk",
-	 .id = 1,
-	 .parent = &spba_clk,
-#ifdef CONFIG_SND_MXC_SOC_IRAM
-	 .secondary = &emi_intr_clk,
-#else
-	 .secondary = &emi_fast_clk,
-#endif
-	 },
-};
-
-static void _clk_ssi_ext1_recalc(struct clk *clk)
-{
-	u32 reg, prediv, podf;
-
-	clk->rate = clk->parent->rate;
-	reg = __raw_readl(MXC_CCM_CSCMR1);
-	if ((reg & MXC_CCM_CSCMR1_SSI_EXT1_COM_CLK_SEL) == 0) {
-		reg = __raw_readl(MXC_CCM_CS1CDR);
-		prediv = ((reg & MXC_CCM_CS1CDR_SSI_EXT1_CLK_PRED_MASK) >>
-			  MXC_CCM_CS1CDR_SSI_EXT1_CLK_PRED_OFFSET) + 1;
-		if (prediv == 1)
-			BUG();
-		podf = ((reg & MXC_CCM_CS1CDR_SSI_EXT1_CLK_PODF_MASK) >>
-			MXC_CCM_CS1CDR_SSI_EXT1_CLK_PODF_OFFSET) + 1;
-		clk->rate = clk->parent->rate / (prediv * podf);
-	}
-}
-
-static int _clk_ssi_ext1_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-
-	reg = __raw_readl(MXC_CCM_CSCMR1);
-	if (parent == &ssi1_clk[0]) {
-		reg |= MXC_CCM_CSCMR1_SSI_EXT1_COM_CLK_SEL;
-	} else {
-		reg &= ~MXC_CCM_CSCMR1_SSI_EXT1_COM_CLK_SEL;
-		mux = _get_mux(parent, &pll1_sw_clk, &pll2_sw_clk, &pll3_sw_clk,
-			       &ssi_lp_apm_clk);
-		reg = (reg & ~MXC_CCM_CSCMR1_SSI_EXT1_CLK_SEL_MASK) |
-		    (mux << MXC_CCM_CSCMR1_SSI_EXT1_CLK_SEL_OFFSET);
-	}
-
-	__raw_writel(reg, MXC_CCM_CSCMR1);
-
-	return 0;
-}
-
-static struct clk ssi_ext1_clk = {
-	.name = "ssi_ext1_clk",
-	.parent = &pll3_sw_clk,
-	.set_parent = _clk_ssi_ext1_set_parent,
-	.recalc = _clk_ssi_ext1_recalc,
-	.enable_reg = MXC_CCM_CCGR3,
-	.enable_shift = MXC_CCM_CCGR3_CG14_OFFSET,
-	.enable = _clk_enable,
-	.disable = _clk_disable,
-};
-
-static void _clk_ssi_ext2_recalc(struct clk *clk)
-{
-	u32 reg, prediv, podf;
-
-	clk->rate = clk->parent->rate;
-	reg = __raw_readl(MXC_CCM_CSCMR1);
-	if ((reg & MXC_CCM_CSCMR1_SSI_EXT2_COM_CLK_SEL) == 0) {
-		reg = __raw_readl(MXC_CCM_CS2CDR);
-		prediv = ((reg & MXC_CCM_CS2CDR_SSI_EXT2_CLK_PRED_MASK) >>
-			  MXC_CCM_CS2CDR_SSI_EXT2_CLK_PRED_OFFSET) + 1;
-		if (prediv == 1)
-			BUG();
-		podf = ((reg & MXC_CCM_CS2CDR_SSI_EXT2_CLK_PODF_MASK) >>
-			MXC_CCM_CS2CDR_SSI_EXT2_CLK_PODF_OFFSET) + 1;
-		clk->rate = clk->parent->rate / (prediv * podf);
-	}
-}
-
-static int _clk_ssi_ext2_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-
-	reg = __raw_readl(MXC_CCM_CSCMR1);
-	if (parent == &ssi2_clk[0]) {
-		reg |= MXC_CCM_CSCMR1_SSI_EXT2_COM_CLK_SEL;
-	} else {
-		reg &= ~MXC_CCM_CSCMR1_SSI_EXT2_COM_CLK_SEL;
-		mux = _get_mux(parent, &pll1_sw_clk, &pll2_sw_clk, &pll3_sw_clk,
-			       &ssi_lp_apm_clk);
-		reg = (reg & ~MXC_CCM_CSCMR1_SSI_EXT2_CLK_SEL_MASK) |
-		    (mux << MXC_CCM_CSCMR1_SSI_EXT2_CLK_SEL_OFFSET);
-	}
-
-	__raw_writel(reg, MXC_CCM_CSCMR1);
-
-	return 0;
-}
-
-static struct clk ssi_ext2_clk = {
-	.name = "ssi_ext2_clk",
-	.parent = &pll3_sw_clk,
-	.set_parent = _clk_ssi_ext2_set_parent,
-	.recalc = _clk_ssi_ext2_recalc,
-	.enable_reg = MXC_CCM_CCGR3,
-	.enable_shift = MXC_CCM_CCGR3_CG15_OFFSET,
-	.enable = _clk_enable,
-	.disable = _clk_disable,
-};
-
-static struct clk iim_clk = {
-	.name = "iim_clk",
-	.parent = &ipg_clk,
-	.secondary = &aips_tz2_clk,
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR0,
-	.enable_shift = MXC_CCM_CCGR0_CG15_OFFSET,
-	.disable = _clk_disable,
-};
-
-static struct clk tmax1_clk = {
-	 .name = "tmax1_clk",
-	 .id = 0,
-	 .parent = &ahb_clk,
-	 .secondary = &ahb_max_clk,
-	 .enable = _clk_enable,
-	 .enable_reg = MXC_CCM_CCGR1,
-	 .enable_shift = MXC_CCM_CCGR1_CG0_OFFSET,
-	 .disable = _clk_disable,
-	 };
-
-static struct clk tmax2_clk = {
-	 .name = "tmax2_clk",
-	 .id = 0,
-	 .parent = &ahb_clk,
-	 .secondary = &ahb_max_clk,
-	 .enable = _clk_enable,
-	 .enable_reg = MXC_CCM_CCGR1,
-	 .enable_shift = MXC_CCM_CCGR1_CG1_OFFSET,
-	 .disable = _clk_disable,
-};
-
-static struct clk tmax3_clk = {
-	 .name = "tmax3_clk",
-	 .id = 0,
-	 .parent = &ahb_clk,
-	 .secondary = &ahb_max_clk,
-	 .enable = _clk_enable,
-	 .enable_reg = MXC_CCM_CCGR1,
-	 .enable_shift = MXC_CCM_CCGR1_CG2_OFFSET,
-	 .disable = _clk_disable,
-};
-
-static void _clk_usboh3_recalc(struct clk *clk)
-{
-	u32 reg, prediv, podf;
-
-	reg = __raw_readl(MXC_CCM_CSCDR1);
-	prediv = ((reg & MXC_CCM_CSCDR1_USBOH3_CLK_PRED_MASK) >>
-		  MXC_CCM_CSCDR1_USBOH3_CLK_PRED_OFFSET) + 1;
-	if (prediv == 1)
-		BUG();
-	podf = ((reg & MXC_CCM_CSCDR1_USBOH3_CLK_PODF_MASK) >>
-		MXC_CCM_CSCDR1_USBOH3_CLK_PODF_OFFSET) + 1;
-
-	clk->rate = clk->parent->rate / (prediv * podf);
-}
-
-static int _clk_usboh3_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-
-	mux = _get_mux(parent, &pll1_sw_clk, &pll2_sw_clk, &pll3_sw_clk,
-		       &lp_apm_clk);
-	reg = __raw_readl(MXC_CCM_CSCMR1) & ~MXC_CCM_CSCMR1_USBOH3_CLK_SEL_MASK;
-	reg |= mux << MXC_CCM_CSCMR1_USBOH3_CLK_SEL_OFFSET;
-	__raw_writel(reg, MXC_CCM_CSCMR1);
-
-	return 0;
-}
-
-static struct clk usboh3_clk[] = {
-	{
-	 .name = "usboh3_clk",
-	 .parent = &pll3_sw_clk,
-	 .set_parent = _clk_usboh3_set_parent,
-	 .recalc = _clk_usboh3_recalc,
-	 .enable = _clk_enable,
-	 .enable_reg = MXC_CCM_CCGR2,
-	 .enable_shift = MXC_CCM_CCGR2_CG14_OFFSET,
-	 .disable = _clk_disable,
-	 .secondary = &usboh3_clk[1],
-	 .flags = AHB_MED_SET_POINT | CPU_FREQ_TRIG_UPDATE,
-	 },
-	{
-	 .name = "usb_sec_clk",
-	 .parent = &tmax2_clk,
-#if defined(CONFIG_USB_STATIC_IRAM) \
-    || defined(CONFIG_USB_STATIC_IRAM_PPH)
-	 .secondary = &emi_intr_clk,
-#else
-	 .secondary = &emi_fast_clk,
-#endif
-	 },
-};
-static struct clk usb_ahb_clk = {
-	 .name = "usb_ahb_clk",
-	 .parent = &ipg_clk,
-	 .enable = _clk_enable,
-	 .enable_reg = MXC_CCM_CCGR2,
-	 .enable_shift = MXC_CCM_CCGR2_CG13_OFFSET,
-	 .disable = _clk_disable,
-};
-
-static void _clk_usb_phy_recalc(struct clk *clk)
-{
-	u32 reg, prediv, podf;
-
-	if (clk->parent == &pll3_sw_clk) {
-		reg = __raw_readl(MXC_CCM_CDCDR);
-		prediv = ((reg & MXC_CCM_CDCDR_USB_PHY_PRED_MASK) >>
-			  MXC_CCM_CDCDR_USB_PHY_PRED_OFFSET) + 1;
-		podf = ((reg & MXC_CCM_CDCDR_USB_PHY_PODF_MASK) >>
-			MXC_CCM_CDCDR_USB_PHY_PODF_OFFSET) + 1;
-
-		clk->rate = clk->parent->rate / (prediv * podf);
-	} else
-		clk->rate = clk->parent->rate;
-}
-
-static int _clk_usb_phy_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg;
-
-	reg = __raw_readl(MXC_CCM_CSCMR1);
-	if (parent == &osc_clk)
-		reg &= ~MXC_CCM_CSCMR1_USB_PHY_CLK_SEL;
-	else if (parent == &pll3_sw_clk)
-		reg |= MXC_CCM_CSCMR1_USB_PHY_CLK_SEL;
-	else
-		BUG();
-
-	__raw_writel(reg, MXC_CCM_CSCMR1);
-	return 0;
-}
-
-static struct clk usb_phy_clk = {
-	.name = "usb_phy_clk",
-	.parent = &pll3_sw_clk,
-	.secondary = &tmax3_clk,
-	.set_parent = _clk_usb_phy_set_parent,
-	.recalc = _clk_usb_phy_recalc,
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR2,
-	.enable_shift = MXC_CCM_CCGR2_CG0_OFFSET,
-	.disable = _clk_disable,
-};
-
-static struct clk esdhc_dep_clks = {
-	 .name = "sd_dep_clk",
-	 .parent = &spba_clk,
-	 .secondary = &emi_fast_clk,
-};
-
-
-static void _clk_esdhc1_recalc(struct clk *clk)
-{
-	u32 reg, prediv, podf;
-
-	reg = __raw_readl(MXC_CCM_CSCDR1);
-	prediv = ((reg & MXC_CCM_CSCDR1_ESDHC1_MSHC1_CLK_PRED_MASK) >>
-		  MXC_CCM_CSCDR1_ESDHC1_MSHC1_CLK_PRED_OFFSET) + 1;
-	podf = ((reg & MXC_CCM_CSCDR1_ESDHC1_MSHC1_CLK_PODF_MASK) >>
-		MXC_CCM_CSCDR1_ESDHC1_MSHC1_CLK_PODF_OFFSET) + 1;
-
-	clk->rate = clk->parent->rate / (prediv * podf);
-}
-
-static int _clk_esdhc1_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-
-	mux = _get_mux(parent, &pll1_sw_clk, &pll2_sw_clk, &pll3_sw_clk,
-		       &lp_apm_clk);
-	reg = __raw_readl(MXC_CCM_CSCMR1) &
-	    ~MXC_CCM_CSCMR1_ESDHC1_MSHC1_CLK_SEL_MASK;
-	reg |= mux << MXC_CCM_CSCMR1_ESDHC1_MSHC1_CLK_SEL_OFFSET;
-	__raw_writel(reg, MXC_CCM_CSCMR1);
-
-	return 0;
-}
-
-static struct clk esdhc1_clk[] = {
-	{
-	 .name = "esdhc_clk",
-	 .id = 0,
-	 .parent = &pll3_sw_clk,
-	 .set_parent = _clk_esdhc1_set_parent,
-	 .recalc = _clk_esdhc1_recalc,
-	 .enable = _clk_enable,
-	 .enable_reg = MXC_CCM_CCGR3,
-	 .enable_shift = MXC_CCM_CCGR3_CG1_OFFSET,
-	 .disable = _clk_disable,
-	 .secondary = &esdhc1_clk[1],
-	 },
-	{
-	 .name = "esdhc_ipg_clk",
-	 .id = 0,
-	 .parent = &ipg_clk,
-	 .secondary = &esdhc1_clk[2],
-	 .enable = _clk_enable,
-	 .enable_reg = MXC_CCM_CCGR3,
-	 .enable_shift = MXC_CCM_CCGR3_CG0_OFFSET,
-	 .disable = _clk_disable,
-	 },
-	{
-	 .name = "esdhc_sec_clk",
-	 .id = 0,
-	 .parent = &tmax3_clk,
-	 .secondary = &esdhc_dep_clks,
-	 },
-
-};
-
-static void _clk_esdhc2_recalc(struct clk *clk)
-{
-	u32 reg, prediv, podf;
-
-	reg = __raw_readl(MXC_CCM_CSCDR1);
-	prediv = ((reg & MXC_CCM_CSCDR1_ESDHC2_MSHC2_CLK_PRED_MASK) >>
-		  MXC_CCM_CSCDR1_ESDHC2_MSHC2_CLK_PRED_OFFSET) + 1;
-	podf = ((reg & MXC_CCM_CSCDR1_ESDHC2_MSHC2_CLK_PODF_MASK) >>
-		MXC_CCM_CSCDR1_ESDHC2_MSHC2_CLK_PODF_OFFSET) + 1;
-
-	clk->rate = clk->parent->rate / (prediv * podf);
-}
-
-static int _clk_esdhc2_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-
-	mux = _get_mux(parent, &pll1_sw_clk, &pll2_sw_clk, &pll3_sw_clk,
-		       &lp_apm_clk);
-	reg = __raw_readl(MXC_CCM_CSCMR1) &
-	    ~MXC_CCM_CSCMR1_ESDHC2_MSHC2_CLK_SEL_MASK;
-	reg |= mux << MXC_CCM_CSCMR1_ESDHC2_MSHC2_CLK_SEL_OFFSET;
-	__raw_writel(reg, MXC_CCM_CSCMR1);
-
-	return 0;
-}
-
-static struct clk esdhc2_clk[] = {
-	{
-	 .name = "esdhc_clk",
-	 .id = 1,
-	 .parent = &pll3_sw_clk,
-	 .set_parent = _clk_esdhc2_set_parent,
-	 .recalc = _clk_esdhc2_recalc,
-	 .enable = _clk_enable,
-	 .enable_reg = MXC_CCM_CCGR3,
-	 .enable_shift = MXC_CCM_CCGR3_CG3_OFFSET,
-	 .disable = _clk_disable,
-	 .secondary = &esdhc2_clk[1],
-	 },
-	{
-	 .name = "esdhc_ipg_clk",
-	 .id = 1,
-	 .parent = &ipg_clk,
-	 .secondary = &esdhc2_clk[2],
-	 .enable = _clk_enable,
-	 .enable_reg = MXC_CCM_CCGR3,
-	 .enable_shift = MXC_CCM_CCGR3_CG2_OFFSET,
-	 .disable = _clk_disable,
-	 },
-	{
-	 .name = "esdhc_sec_clk",
-	 .id = 0,
-	 .parent = &tmax2_clk,
-	 .secondary = &esdhc_dep_clks,
-	 },
-};
-
-static int _clk_esdhc3_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg;
-
-	reg = __raw_readl(MXC_CCM_CSCMR1);
-	if (parent == &esdhc1_clk[0])
-		reg &= ~MXC_CCM_CSCMR1_ESDHC3_CLK_SEL;
-	else if (parent == &esdhc2_clk[0])
-		reg |= MXC_CCM_CSCMR1_ESDHC3_CLK_SEL;
-	else
-		BUG();
-
-	__raw_writel(reg, MXC_CCM_CSCMR1);
-
-	return 0;
-}
-
-static struct clk esdhc3_clk[] = {
-	{
-	 .name = "esdhc_clk",
-	 .id = 2,
-	 .parent = &esdhc1_clk[0],
-	 .set_parent = _clk_esdhc3_set_parent,
-	 .enable = _clk_enable,
-	 .enable_reg = MXC_CCM_CCGR3,
-	 .enable_shift = MXC_CCM_CCGR3_CG5_OFFSET,
-	 .disable = _clk_disable,
-	 .secondary = &esdhc3_clk[1],
-	 },
-	{
-	 .name = "esdhc_ipg_clk",
-	 .id = 2,
-	 .parent = &ipg_clk,
-	 .secondary = &esdhc3_clk[2],
-	 .enable = _clk_enable,
-	 .enable_reg = MXC_CCM_CCGR3,
-	 .enable_shift = MXC_CCM_CCGR3_CG4_OFFSET,
-	 .disable = _clk_disable,
-	 },
-	{
-	 .name = "esdhc_sec_clk",
-	 .id = 0,
-	 .parent = &ahb_max_clk,
-	 .secondary = &esdhc_dep_clks,
-	 },
-};
-
-
-static int _clk_esdhc4_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg;
-
-	reg = __raw_readl(MXC_CCM_CSCMR1);
-	if (parent == &esdhc1_clk[0])
-		reg &= ~MXC_CCM_CSCMR1_ESDHC4_CLK_SEL;
-	else if (parent == &esdhc2_clk[0])
-		reg |= MXC_CCM_CSCMR1_ESDHC4_CLK_SEL;
-	else
-		BUG();
-
-	__raw_writel(reg, MXC_CCM_CSCMR1);
-
-	return 0;
-}
-
-static struct clk esdhc4_clk[] = {
-	{
-	 .name = "esdhc_clk",
-	 .id = 3,
-	 .parent = &esdhc1_clk[0],
-	 .set_parent = _clk_esdhc4_set_parent,
-	 .enable = _clk_enable,
-	 .enable_reg = MXC_CCM_CCGR3,
-	 .enable_shift = MXC_CCM_CCGR3_CG7_OFFSET,
-	 .disable = _clk_disable,
-	 .secondary = &esdhc4_clk[1],
-	 },
-	{
-	 .name = "esdhc_ipg_clk",
-	 .id = 3,
-	 .parent = &ipg_clk,
-	 .secondary = &esdhc4_clk[2],
-	 .enable = _clk_enable,
-	 .enable_reg = MXC_CCM_CCGR3,
-	 .enable_shift = MXC_CCM_CCGR3_CG6_OFFSET,
-	 .disable = _clk_disable,
-	 },
-	{
-	 .name = "esdhc_sec_clk",
-	 .id = 0,
-	 .parent = &tmax3_clk,
-	 .secondary = &esdhc_dep_clks,
-	 },
-};
-
-static int _clk_sim_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-
-	mux = _get_mux(parent, &pll1_sw_clk, &pll2_sw_clk, &pll3_sw_clk, NULL);
-	reg = __raw_readl(MXC_CCM_CSCMR2) & ~MXC_CCM_CSCMR2_SIM_CLK_SEL_MASK;
-	reg |= mux << MXC_CCM_CSCMR2_SIM_CLK_SEL_OFFSET;
-	__raw_writel(reg, MXC_CCM_CSCMR2);
-
-	return 0;
-}
-
-static void _clk_sim_recalc(struct clk *clk)
-{
-	u32 reg, pred, podf;
-
-	reg = __raw_readl(MXC_CCM_CSCDR2);
-	pred = ((reg & MXC_CCM_CSCDR2_SIM_CLK_PRED_MASK) >>
-		MXC_CCM_CSCDR2_SIM_CLK_PRED_OFFSET) + 1;
-	podf = ((reg & MXC_CCM_CSCDR2_SIM_CLK_PODF_MASK) >>
-		MXC_CCM_CSCDR2_SIM_CLK_PODF_OFFSET) + 1;
-	clk->rate = clk->parent->rate / (pred * podf);
-}
-
-static unsigned long _clk_sim_round_rate(struct clk *clk, unsigned long rate)
-{
-	u32 pre, post;
-	u32 div = clk->parent->rate / rate;
-	if (clk->parent->rate % rate)
-		div++;
-
-	__calc_pre_post_dividers(div, &pre, &post);
-
-	return clk->parent->rate / (pre * post);
-}
-
-static int _clk_sim_set_rate(struct clk *clk, unsigned long rate)
-{
-	u32 reg;
-	u32 div;
-	u32 pre, post;
-
-	div = clk->parent->rate / rate;
-
-	if ((clk->parent->rate / div) != rate)
-		return -EINVAL;
-
-	__calc_pre_post_dividers(div, &pre, &post);
-
-	/* Set SIM clock divider */
-	reg = __raw_readl(MXC_CCM_CSCDR2) &
-	    ~(MXC_CCM_CSCDR2_SIM_CLK_PRED_MASK |
-	      MXC_CCM_CSCDR2_SIM_CLK_PODF_MASK);
-	reg |= (post - 1) << MXC_CCM_CSCDR2_SIM_CLK_PODF_OFFSET;
-	reg |= (pre - 1) << MXC_CCM_CSCDR2_SIM_CLK_PRED_OFFSET;
-	__raw_writel(reg, MXC_CCM_CSCDR2);
-
-	clk->rate = rate;
-	return 0;
-
-}
-
-static struct clk sim_clk[] = {
-	{
-	.name = "sim_clk",
-	.parent = &pll3_sw_clk,
-	.set_parent = _clk_sim_set_parent,
-	.secondary = &sim_clk[1],
-	.recalc = _clk_sim_recalc,
-	.round_rate = _clk_sim_round_rate,
-	.set_rate = _clk_sim_set_rate,
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR4,
-	.enable_shift = MXC_CCM_CCGR4_CG2_OFFSET,
-	.disable = _clk_disable,
-	.flags = AHB_HIGH_SET_POINT | CPU_FREQ_TRIG_UPDATE,
-	 },
-	{
-	.name = "sim_ipg_clk",
-	.parent = &ipg_clk,
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR4,
-	.enable_shift = MXC_CCM_CCGR4_CG1_OFFSET,
-	.disable = _clk_disable,
-	 },
-};
-
-static void _clk_nfc_recalc(struct clk *clk)
-{
-	u32 reg, div;
-
-	reg = __raw_readl(MXC_CCM_CBCDR);
-	div = ((reg & MXC_CCM_CBCDR_NFC_PODF_MASK) >>
-	       MXC_CCM_CBCDR_NFC_PODF_OFFSET) + 1;
-	clk->rate = clk->parent->rate / div;
-}
-
-static unsigned long _clk_nfc_round_rate(struct clk *clk,
-						unsigned long rate)
-{
-	u32 div;
-
-	/*
-	 * Compute the divider we'd have to use to reach the target rate.
-	 */
-
-	div = clk->parent->rate / rate;
-
-	/*
-	 * If there's a remainder after the division, then we have to increment
-	 * the divider. There are two reasons for this:
-	 *
-	 * 1) The frequency we round to must be LESS THAN OR EQUAL to the
-	 *    target. We aren't allowed to round to a frequency that is higher
-	 *    than the target.
-	 *
-	 * 2) This also catches the case where target rate is less than the
-	 *    parent rate, which implies a divider of zero. We can't allow a
-	 *    divider of zero.
-	 */
-
-	if (clk->parent->rate % rate)
-		div++;
-
-	/*
-	 * The divider for this clock is 3 bits wide, so we can't possibly
-	 * divide the parent by more than eight.
-	 */
-
-	if (div > 8)
-		return -EINVAL;
-
-	return clk->parent->rate / div;
-
-}
-
-static int _clk_nfc_set_rate(struct clk *clk, unsigned long rate)
-{
-	u32 reg, div;
-	struct timespec nstimeofday;
-	struct timespec curtime;
-
-	div = clk->parent->rate / rate;
-	if (div == 0)
-		div++;
-	if (((clk->parent->rate / div) != rate) || (div > 8))
-		return -EINVAL;
-
-	if (emi_fast_clk.usecount == 0)
-		emi_fast_clk.enable(&emi_fast_clk);
-	if (emi_slow_clk.usecount == 0)
-		emi_slow_clk.enable(&emi_slow_clk);
-
-
-	reg = __raw_readl(MXC_CCM_CBCDR);
-	reg &= ~MXC_CCM_CBCDR_NFC_PODF_MASK;
-	reg |= (div - 1) << MXC_CCM_CBCDR_NFC_PODF_OFFSET;
-	__raw_writel(reg, MXC_CCM_CBCDR);
-	getnstimeofday(&nstimeofday);
-	while (__raw_readl(MXC_CCM_CDHIPR) &
-			MXC_CCM_CDHIPR_NFC_IPG_INT_MEM_PODF_BUSY){
-		getnstimeofday(&curtime);
-		if ((curtime.tv_nsec - nstimeofday.tv_nsec) > SPIN_DELAY)
-			panic("_clk_nfc_set_rate failed\n");
-	}
-	clk->rate = rate;
-	if (emi_fast_clk.usecount == 0)
-		emi_fast_clk.disable(&emi_fast_clk);
-	if (emi_slow_clk.usecount == 0)
-		emi_slow_clk.disable(&emi_slow_clk);
-
-	return 0;
-}
-
-static struct clk emi_enfc_clk = {
-	.name = "nfc_clk",
-	.parent = &emi_slow_clk,
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR5,
-	.enable_shift = MXC_CCM_CCGR5_CG10_OFFSET,
-	.disable = _clk_disable_inwait,
-	.recalc = _clk_nfc_recalc,
-	.round_rate = _clk_nfc_round_rate,
-	.set_rate = _clk_nfc_set_rate,
-};
-
-static int _clk_spdif_xtal_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-
-	mux = _get_mux(parent, &osc_clk, &ckih_clk, &ckih2_clk, NULL);
-	reg = __raw_readl(MXC_CCM_CSCMR1) & ~MXC_CCM_CSCMR1_SPDIF_CLK_SEL_MASK;
-	reg |= mux << MXC_CCM_CSCMR1_SPDIF_CLK_SEL_OFFSET;
-	__raw_writel(reg, MXC_CCM_CSCMR1);
-
-	return 0;
-}
-
-static struct clk spdif_xtal_clk = {
-	.name = "spdif_xtal_clk",
-	.parent = &osc_clk,
-	.set_parent = _clk_spdif_xtal_set_parent,
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR5,
-	.enable_shift = MXC_CCM_CCGR5_CG15_OFFSET,
-	.disable = _clk_disable,
-};
-
-static int _clk_spdif0_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-
-	reg = __raw_readl(MXC_CCM_CSCMR2);
-	reg |= MXC_CCM_CSCMR2_SPDIF0_COM;
-	if (parent != &ssi1_clk[0]) {
-		reg &= ~MXC_CCM_CSCMR2_SPDIF0_COM;
-		mux = _get_mux(parent, &pll1_sw_clk, &pll2_sw_clk, &pll3_sw_clk,
-			       &spdif_xtal_clk);
-		reg = (reg & ~MXC_CCM_CSCMR2_SPDIF0_CLK_SEL_MASK) |
-		    (mux << MXC_CCM_CSCMR2_SPDIF0_CLK_SEL_OFFSET);
-	}
-	__raw_writel(reg, MXC_CCM_CSCMR2);
-
-	return 0;
-}
-
-static void _clk_spdif0_recalc(struct clk *clk)
-{
-	u32 reg, pred, podf;
-
-	if (clk->parent == &ssi1_clk[0]) {
-		clk->rate = clk->parent->rate;
-	} else {
-		reg = __raw_readl(MXC_CCM_CDCDR);
-		pred = ((reg & MXC_CCM_CDCDR_SPDIF0_CLK_PRED_MASK) >>
-			MXC_CCM_CDCDR_SPDIF0_CLK_PRED_OFFSET) + 1;
-		podf = ((reg & MXC_CCM_CDCDR_SPDIF0_CLK_PODF_MASK) >>
-			MXC_CCM_CDCDR_SPDIF0_CLK_PODF_OFFSET) + 1;
-		clk->rate = clk->parent->rate / (pred * podf);
-	}
-}
-
-static struct clk spdif0_clk[] = {
-	{
-	.name = "spdif_clk",
-	.id = 0,
-	.parent = &pll3_sw_clk,
-	.set_parent = _clk_spdif0_set_parent,
-	.recalc = _clk_spdif0_recalc,
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR5,
-	.enable_shift = MXC_CCM_CCGR5_CG13_OFFSET,
-	.disable = _clk_disable,
-	.flags = AHB_HIGH_SET_POINT | CPU_FREQ_TRIG_UPDATE,
-	},
-	{
-	 .name = "spdif_ipg_clk",
-	 .id = 0,
-	 .parent = &ipg_clk,
-	 .secondary = &spba_clk,
-	 .enable = _clk_enable,
-	 .enable_reg = MXC_CCM_CCGR5,
-	 .enable_shift = MXC_CCM_CCGR5_CG15_OFFSET,
-	 .disable = _clk_disable,
-	 },
-};
-
-static int _clk_spdif1_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-
-	reg = __raw_readl(MXC_CCM_CSCMR2);
-	reg |= MXC_CCM_CSCMR2_SPDIF1_COM;
-	if (parent != &ssi2_clk[0]) {
-		reg &= ~MXC_CCM_CSCMR2_SPDIF1_COM;
-		mux = _get_mux(parent, &pll1_sw_clk, &pll2_sw_clk, &pll3_sw_clk,
-			       &spdif_xtal_clk);
-		reg = (reg & ~MXC_CCM_CSCMR2_SPDIF1_CLK_SEL_MASK) |
-		    (mux << MXC_CCM_CSCMR2_SPDIF1_CLK_SEL_OFFSET);
-	}
-	__raw_writel(reg, MXC_CCM_CSCMR2);
-
-	return 0;
-}
-
-static void _clk_spdif1_recalc(struct clk *clk)
-{
-	u32 reg, pred, podf;
-
-	if (clk->parent == &ssi2_clk[0]) {
-		clk->rate = clk->parent->rate;
-	} else {
-		reg = __raw_readl(MXC_CCM_CDCDR);
-		pred = ((reg & MXC_CCM_CDCDR_SPDIF1_CLK_PRED_MASK) >>
-			MXC_CCM_CDCDR_SPDIF1_CLK_PRED_OFFSET) + 1;
-		podf = ((reg & MXC_CCM_CDCDR_SPDIF1_CLK_PODF_MASK) >>
-			MXC_CCM_CDCDR_SPDIF1_CLK_PODF_OFFSET) + 1;
-		clk->rate = clk->parent->rate / (pred * podf);
-	}
-}
-
-static struct clk spdif1_clk[] = {
-	{
-	.name = "spdif_clk",
-	.id = 1,
-	.parent = &pll3_sw_clk,
-	.set_parent = _clk_spdif1_set_parent,
-	.recalc = _clk_spdif1_recalc,
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR5,
-	.enable_shift = MXC_CCM_CCGR5_CG14_OFFSET,
-	.disable = _clk_disable,
-	.flags = AHB_HIGH_SET_POINT | CPU_FREQ_TRIG_UPDATE,
-	},
-	{
-	 .name = "spdif_ipg_clk",
-	 .id = 0,
-	 .parent = &ipg_clk,
-	 .secondary = &spba_clk,
-	 .enable = _clk_enable,
-	 .enable_reg = MXC_CCM_CCGR5,
-	 .enable_shift = MXC_CCM_CCGR5_CG15_OFFSET,
-	 .disable = _clk_disable,
-	 },
-};
-
-static int _clk_ddr_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, reg2, mux;
-	struct timespec nstimeofday;
-	struct timespec curtime;
-
-	reg = __raw_readl(MXC_CCM_CBCMR);
-	reg2 = __raw_readl(MXC_CCM_CBCDR);
-	mux = _get_mux_ddr(parent, &axi_a_clk, &axi_b_clk, &emi_slow_clk, &ahb_clk, &ddr_hf_clk);
-	if (mux < 4) {
-		reg = (reg & ~MXC_CCM_CBCMR_DDR_CLK_SEL_MASK) |
-		    (mux << MXC_CCM_CBCMR_DDR_CLK_SEL_OFFSET);
-		__raw_writel(reg, MXC_CCM_CBCMR);
-		reg2 = (reg2 & ~MXC_CCM_CBCDR_DDR_HF_SEL);
-	} else {
-		reg2 = (reg2 & ~MXC_CCM_CBCDR_DDR_HF_SEL) |
-			(MXC_CCM_CBCDR_DDR_HF_SEL);
-	}
-	__raw_writel(reg2, MXC_CCM_CBCDR);
-	getnstimeofday(&nstimeofday);
-	while (__raw_readl(MXC_CCM_CDHIPR) &
-		MXC_CCM_CDHIPR_DDR_HF_CLK_SEL_BUSY){
-		getnstimeofday(&curtime);
-		if ((curtime.tv_nsec - nstimeofday.tv_nsec) > SPIN_DELAY)
-			panic("_clk_ddr_set_parent failed\n");
-	}
-	return 0;
-}
-
-static struct clk ddr_clk = {
-	.name = "ddr_clk",
-	.parent = &ddr_hf_clk,
-	.set_parent = _clk_ddr_set_parent,
-	.flags = RATE_PROPAGATES,
-};
-
-static int _clk_arm_axi_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-	reg = __raw_readl(MXC_CCM_CBCMR);
-	mux = _get_mux(parent, &axi_a_clk, &axi_b_clk, &emi_slow_clk, &ahb_clk);
-	reg = (reg & ~MXC_CCM_CBCMR_ARM_AXI_CLK_SEL_MASK) |
-	    (mux << MXC_CCM_CBCMR_ARM_AXI_CLK_SEL_OFFSET);
-	__raw_writel(reg, MXC_CCM_CBCMR);
-
-	return 0;
-}
-
-static struct clk arm_axi_clk = {
-	.name = "arm_axi_clk",
-	.parent = &axi_a_clk,
-	.set_parent = _clk_arm_axi_set_parent,
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR0,
-	.enable_shift = MXC_CCM_CCGR0_CG1_OFFSET,
-	.disable = _clk_disable,
-};
-
-static int _clk_vpu_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-	reg = __raw_readl(MXC_CCM_CBCMR);
-	mux = _get_mux(parent, &axi_a_clk, &axi_b_clk, &emi_slow_clk, &ahb_clk);
-	reg = (reg & ~MXC_CCM_CBCMR_VPU_AXI_CLK_SEL_MASK) |
-	    (mux << MXC_CCM_CBCMR_VPU_AXI_CLK_SEL_OFFSET);
-	__raw_writel(reg, MXC_CCM_CBCMR);
-
-	return 0;
-}
-
-static int _clk_vpu_enable(struct clk *clk)
-{
-	/* Set VPU's parent to be axi_a or ahb when its enabled. */
-	if (cpu_is_mx51_rev(CHIP_REV_2_0) < 0) {
-		clk_set_parent(&vpu_clk[0], &ahb_clk);
-		clk_set_parent(&vpu_clk[1], &ahb_clk);
-	} else {
-		clk_set_parent(&vpu_clk[0], &axi_a_clk);
-		clk_set_parent(&vpu_clk[1], &axi_a_clk);
-	}
-
-	return _clk_enable(clk);
-
-}
-
-static void _clk_vpu_disable(struct clk *clk)
-{
-	_clk_disable(clk);
-
-	/* Set VPU's parent to be axi_b when its disabled. */
-	clk_set_parent(&vpu_clk[0], &axi_b_clk);
-	clk_set_parent(&vpu_clk[1], &axi_b_clk);
-}
-
-static struct clk vpu_clk[] = {
-	{
-	 .name = "vpu_clk",
-	 .set_parent = _clk_vpu_set_parent,
-	 .enable = _clk_enable,
-	 .enable_reg = MXC_CCM_CCGR5,
-	 .enable_shift = MXC_CCM_CCGR5_CG4_OFFSET,
-	 .disable = _clk_disable,
-	 .secondary = &vpu_clk[1],
-	.flags = AHB_HIGH_SET_POINT | CPU_FREQ_TRIG_UPDATE,
-	 },
-	{
-	 .name = "vpu_core_clk",
-	 .set_parent = _clk_vpu_set_parent,
-	 .enable = _clk_vpu_enable,
-	 .enable_reg = MXC_CCM_CCGR5,
-	 .enable_shift = MXC_CCM_CCGR5_CG3_OFFSET,
-	 .disable = _clk_vpu_disable,
-	 .secondary = &vpu_clk[2],
-	 },
-	{
-	 .name = "vpu_emi_clk",
-	 .parent = &emi_fast_clk,
-#ifdef CONFIG_MXC_VPU_IRAM
-	 .secondary = &emi_intr_clk,
-#endif
-	 }
-};
-
-static int _clk_lpsr_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-	reg = __raw_readl(MXC_CCM_CLPCR);
-	mux = _get_mux(parent, &ckil_clk, &fpm_clk, &fpm_div2_clk, NULL);
-	reg = (reg & ~MXC_CCM_CLPCR_LPSR_CLK_SEL_MASK) |
-	    (mux << MXC_CCM_CLPCR_LPSR_CLK_SEL_OFFSET);
-	__raw_writel(reg, MXC_CCM_CLPCR);
-
-	return 0;
-}
-
-static struct clk lpsr_clk = {
-	.name = "lpsr_clk",
-	.parent = &ckil_clk,
-	.set_parent = _clk_lpsr_set_parent,
-};
-
-static void _clk_pgc_recalc(struct clk *clk)
-{
-	u32 reg, div;
-
-	reg = __raw_readl(MXC_CCM_CSCDR1);
-	div = (reg & MXC_CCM_CSCDR1_PGC_CLK_PODF_MASK) >>
-	    MXC_CCM_CSCDR1_PGC_CLK_PODF_OFFSET;
-	div = 1 >> div;
-	clk->rate = clk->parent->rate / div;
-}
-
-static struct clk pgc_clk = {
-	.name = "pgc_clk",
-	.parent = &ipg_clk,
-	.recalc = _clk_pgc_recalc,
-};
-
-/*usb OTG clock */
-
-static struct clk usb_clk = {
-	.name = "usb_clk",
-	.rate = 60000000,
-};
-
-static struct clk usb_utmi_clk = {
-	.name = "usb_utmi_clk",
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CSCMR1,
-	.enable_shift = MXC_CCM_CSCMR1_USB_PHY_CLK_SEL_OFFSET,
-	.disable = _clk_disable,
-};
-
-static struct clk rtc_clk = {
-	.name = "rtc_clk",
-	.parent = &ckil_clk,
-	.secondary = &ipg_clk,
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR4,
-	.enable_shift = MXC_CCM_CCGR4_CG14_OFFSET,
-	.disable = _clk_disable,
-};
-
-static struct clk ata_clk = {
-	.name = "ata_clk",
-	.parent = &ipg_clk,
-	.secondary = &spba_clk,
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR4,
-	.enable_shift = MXC_CCM_CCGR4_CG0_OFFSET,
-	.disable = _clk_disable,
-	.flags = AHB_HIGH_SET_POINT | CPU_FREQ_TRIG_UPDATE,
-};
-
-static struct clk owire_clk = {
-	.name = "owire_clk",
-	.parent = &ipg_perclk,
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR2,
-	.enable_shift = MXC_CCM_CCGR2_CG11_OFFSET,
-	.disable = _clk_disable,
-};
-
-
-static struct clk fec_clk[] = {
-	{
-	.name = "fec_clk",
-	.parent = &ipg_clk,
-	.secondary = &fec_clk[1],
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR2,
-	.enable_shift = MXC_CCM_CCGR2_CG12_OFFSET,
-	.disable = _clk_disable,
-	.flags = AHB_HIGH_SET_POINT | CPU_FREQ_TRIG_UPDATE,
-	},
-	{
-	 .name = "fec_sec1_clk",
-	 .parent = &tmax2_clk,
-	 .secondary = &fec_clk[2],
-	},
-	{
-	 .name = "fec_sec2_clk",
-	 .parent = &aips_tz2_clk,
-	 .secondary = &emi_fast_clk,
-	},
-};
-
-static struct clk sahara_clk[] = {
-	{
-	.name = "sahara_clk",
-	.parent = &ahb_clk,
-	.secondary = &sahara_clk[1],
-	.enable_reg = MXC_CCM_CCGR4,
-	.enable_shift = MXC_CCM_CCGR4_CG7_OFFSET,
-	.enable = _clk_enable,
-	.disable = _clk_disable,
-	},
-	{
-	.name = "sahara_sec_clk",
-	.parent = &tmax1_clk,
-	.secondary = &emi_fast_clk,
-	}
-};
-
-static struct clk scc_clk[] = {
-	{
-	.name = "scc_clk",
-	.parent = &ahb_clk,
-	.secondary = &scc_clk[1],
-	.enable_reg = MXC_CCM_CCGR1,
-	.enable_shift = MXC_CCM_CCGR1_CG15_OFFSET,
-	.enable = _clk_enable,
-	.disable = _clk_disable,
-	},
-	{
-	.name = "scc_sec_clk",
-	.parent = &tmax1_clk,
-	.secondary = &emi_fast_clk,
-	}
-};
-
-
-static int _clk_gpu3d_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-
-	reg = __raw_readl(MXC_CCM_CBCMR);
-	mux = _get_mux(parent, &axi_a_clk, &axi_b_clk, &emi_slow_clk, &ahb_clk);
-	reg = (reg & ~MXC_CCM_CBCMR_GPU_CLK_SEL_MASK) |
-	    (mux << MXC_CCM_CBCMR_GPU_CLK_SEL_OFFSET);
-	__raw_writel(reg, MXC_CCM_CBCMR);
-
-	return 0;
-}
-
-static struct clk gpu3d_clk = {
-	.name = "gpu3d_clk",
-	.parent = &axi_a_clk,
-	.set_parent = _clk_gpu3d_set_parent,
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR5,
-	.enable_shift = MXC_CCM_CCGR5_CG1_OFFSET,
-	.disable = _clk_disable,
-	.flags = AHB_HIGH_SET_POINT | CPU_FREQ_TRIG_UPDATE,
-};
-
-static struct clk garb_clk = {
-	.name = "garb_clk",
-	.parent = &axi_a_clk,
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR5,
-	.enable_shift = MXC_CCM_CCGR5_CG2_OFFSET,
-	.disable = _clk_disable,
-};
-
-static struct clk emi_garb_clk = {
-	.name = "emi_garb_clk",
-	.parent = &axi_a_clk,
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR6,
-	.enable_shift = MXC_CCM_CCGR6_CG4_OFFSET,
-	.disable = _clk_disable,
-};
-
-static int _clk_gpu2d_set_parent(struct clk *clk, struct clk *parent)
-{
-	u32 reg, mux;
-
-	reg = __raw_readl(MXC_CCM_CBCMR);
-	mux = _get_mux(parent, &axi_a_clk, &axi_b_clk, &emi_slow_clk, &ahb_clk);
-	reg = (reg & ~MXC_CCM_CBCMR_GPU2D_CLK_SEL_MASK) |
-	    (mux << MXC_CCM_CBCMR_GPU2D_CLK_SEL_OFFSET);
-	__raw_writel(reg, MXC_CCM_CBCMR);
-
-	return 0;
-}
-
-static struct clk gpu2d_clk = {
-	.name = "gpu2d_clk",
-	.parent = &axi_a_clk,
-	.set_parent = _clk_gpu2d_set_parent,
-	.enable = _clk_enable,
-	.enable_reg = MXC_CCM_CCGR6,
-	.enable_shift = MXC_CCM_CCGR6_CG7_OFFSET,
-	.disable = _clk_disable,
-	.flags = AHB_HIGH_SET_POINT | CPU_FREQ_TRIG_UPDATE,
-};
-
-static struct clk *mxc_clks[] = {
-	&osc_clk,
-	&ckih_clk,
-	&ckih2_clk,
-	&ckil_clk,
-	&fpm_clk,
-	&fpm_div2_clk,
-	&pll1_main_clk,
-	&pll1_sw_clk,
-	&pll2_sw_clk,
-	&pll3_sw_clk,
-	&ipumux1_clk,
-	&ipumux2_clk,
-	&gpc_dvfs_clk,
-	&lp_apm_clk,
-	&cpu_clk,
-	&periph_apm_clk,
-	&main_bus_clk,
-	&axi_a_clk,
-	&axi_b_clk,
-	&ahb_clk,
-	&ahb_max_clk,
-	&ipg_clk,
-	&ipg_perclk,
-	&ahbmux1_clk,
-	&ahbmux2_clk,
-	&aips_tz1_clk,
-	&aips_tz2_clk,
-	&sdma_clk[0],
-	&sdma_clk[1],
-	&ipu_clk[0],
-	&ipu_clk[1],
-	&ipu_di_clk[0],
-	&ipu_di_clk[1],
-	&tve_clk,
-	&csi0_clk,
-	&csi1_clk,
-	&uart_main_clk,
-	&uart1_clk[0],
-	&uart1_clk[1],
-	&uart2_clk[0],
-	&uart2_clk[1],
-	&uart3_clk[0],
-	&uart3_clk[1],
-	&spba_clk,
-	&i2c_clk[0],
-	&i2c_clk[1],
-	&hsi2c_clk,
-	&hsi2c_serial_clk,
-	&gpt_clk[0],
-	&gpt_clk[1],
-	&gpt_clk[2],
-	&pwm1_clk[0],
-	&pwm1_clk[1],
-	&pwm1_clk[2],
-	&pwm2_clk[0],
-	&pwm2_clk[1],
-	&pwm2_clk[2],
-	&cspi_main_clk,
-	&cspi1_clk[0],
-	&cspi1_clk[1],
-	&cspi2_clk[0],
-	&cspi2_clk[1],
-	&cspi3_clk[0],
-	&cspi3_clk[1],
-	&ssi_lp_apm_clk,
-	&ssi1_clk[0],
-	&ssi1_clk[1],
-	&ssi1_clk[2],
-	&ssi2_clk[0],
-	&ssi2_clk[1],
-	&ssi2_clk[2],
-	&ssi_ext1_clk,
-	&ssi_ext2_clk,
-	&iim_clk,
-	&tmax1_clk,
-	&tmax2_clk,
-	&tmax3_clk,
-	&usboh3_clk[0],
-	&usboh3_clk[1],
-	&usb_ahb_clk,
-	&usb_phy_clk,
-	&usb_utmi_clk,
-	&usb_clk,
-	&esdhc1_clk[0],
-	&esdhc1_clk[1],
-	&esdhc2_clk[0],
-	&esdhc2_clk[1],
-	&esdhc3_clk[0],
-	&esdhc3_clk[1],
-	&esdhc4_clk[0],
-	&esdhc4_clk[1],
-	&esdhc_dep_clks,
-	&sim_clk[0],
-	&sim_clk[1],
-	&emi_slow_clk,
-	&ddr_clk,
-	&emi_enfc_clk,
-	&emi_fast_clk,
-	&emi_intr_clk,
-	&spdif_xtal_clk,
-	&spdif0_clk[0],
-	&spdif0_clk[1],
-	&spdif1_clk[0],
-	&spdif1_clk[1],
-	&arm_axi_clk,
-	&vpu_clk[0],
-	&vpu_clk[1],
-	&vpu_clk[2],
-	&lpsr_clk,
-	&pgc_clk,
-	&rtc_clk,
-	&ata_clk,
-	&owire_clk,
-	&fec_clk[0],
-	&fec_clk[1],
-	&fec_clk[2],
-	&mipi_hsc1_clk,
-	&mipi_hsc2_clk,
-	&mipi_esc_clk,
-	&mipi_hsp_clk,
-	&sahara_clk[0],
-	&sahara_clk[1],
-	&gpu3d_clk,
-	&garb_clk,
-	&emi_garb_clk,
-	&ddr_hf_clk,
-	&gpu2d_clk,
-	&scc_clk[0],
-	&scc_clk[1],
-};
-
-static void clk_tree_init(void)
-{
-	u32 reg, reg2, dp_ctl;
-
-	ipg_perclk.set_parent(&ipg_perclk, &lp_apm_clk);
-
-	/*
-	 *Initialise the IPG PER CLK dividers to 3. IPG_PER_CLK should be at
-	 * 8MHz, its derived from lp_apm.
-	 */
-	reg = __raw_readl(MXC_CCM_CBCDR);
-	reg &= ~MXC_CCM_CBCDR_PERCLK_PRED1_MASK;
-	reg &= ~MXC_CCM_CBCDR_PERCLK_PRED2_MASK;
-	reg &= ~MXC_CCM_CBCDR_PERCLK_PODF_MASK;
-	reg |= (2 << MXC_CCM_CBCDR_PERCLK_PRED1_OFFSET);
-	__raw_writel(reg, MXC_CCM_CBCDR);
-
-	/* set pll1_main_clk parent */
-	pll1_main_clk.parent = &osc_clk;
-	dp_ctl = __raw_readl(pll1_base + MXC_PLL_DP_CTL);
-	if ((dp_ctl & MXC_PLL_DP_CTL_REF_CLK_SEL_MASK) == 0)
-		pll1_main_clk.parent = &fpm_clk;
-	/* set pll2_sw_clk parent */
-	pll2_sw_clk.parent = &osc_clk;
-	dp_ctl = __raw_readl(pll2_base + MXC_PLL_DP_CTL);
-	if ((dp_ctl & MXC_PLL_DP_CTL_REF_CLK_SEL_MASK) == 0)
-		pll2_sw_clk.parent = &fpm_clk;
-	/* set pll3_clk parent */
-	pll3_sw_clk.parent = &osc_clk;
-	dp_ctl = __raw_readl(pll3_base + MXC_PLL_DP_CTL);
-	if ((dp_ctl & MXC_PLL_DP_CTL_REF_CLK_SEL_MASK) == 0)
-		pll3_sw_clk.parent = &fpm_clk;
-
-	/* set emi_slow_clk parent */
-	emi_slow_clk.parent = &main_bus_clk;
-	reg = __raw_readl(MXC_CCM_CBCDR);
-	if ((reg & MXC_CCM_CBCDR_EMI_CLK_SEL) != 0)
-		emi_slow_clk.parent = &ahb_clk;
-
-	/* set ipg_perclk parent */
-	ipg_perclk.parent = &lp_apm_clk;
-	reg = __raw_readl(MXC_CCM_CBCMR);
-	if ((reg & MXC_CCM_CBCMR_PERCLK_IPG_CLK_SEL) != 0) {
-		ipg_perclk.parent = &ipg_clk;
-	} else {
-		if ((reg & MXC_CCM_CBCMR_PERCLK_LP_APM_CLK_SEL) == 0)
-			ipg_perclk.parent = &main_bus_clk;
-	}
-
-	/* set DDR clock parent */
-	reg = __raw_readl(MXC_CCM_CBCMR) & MXC_CCM_CBCMR_DDR_CLK_SEL_MASK;
-	reg >>= MXC_CCM_CBCMR_DDR_CLK_SEL_OFFSET;
-	reg2 = __raw_readl(MXC_CCM_CBCDR) & MXC_CCM_CBCDR_DDR_HF_SEL;
-	reg2 >>= MXC_CCM_CBCDR_DDR_HF_SEL_OFFSET;
-
-	if (reg2) {
-		ddr_clk.parent = &ddr_hf_clk;
-	} else {
-		if (reg == 0) {
-			ddr_clk.parent = &axi_a_clk;
-		} else if (reg == 1) {
-			ddr_clk.parent = &axi_b_clk;
-		} else if (reg == 2) {
-			ddr_clk.parent = &emi_slow_clk;
-		} else {
-			ddr_clk.parent = &ahb_clk;
-		}
-	}
-}
-
-int __init mx51_clocks_init(unsigned long ckil, unsigned long osc, unsigned long ckih1, unsigned long ckih2)
-{
-	__iomem void *base;
-	struct clk **clkp;
-	int i = 0, j = 0, reg;
-	int wp_cnt = 0;
-
-	pll1_base = ioremap(PLL1_BASE_ADDR, SZ_4K);
-	pll2_base = ioremap(PLL2_BASE_ADDR, SZ_4K);
-	pll3_base = ioremap(PLL3_BASE_ADDR, SZ_4K);
-
-	/* Turn off all possible clocks */
-	if (mxc_jtag_enabled) {
-		__raw_writel(1 << MXC_CCM_CCGR0_CG0_OFFSET |
-			      1 << MXC_CCM_CCGR0_CG1_OFFSET |
-			      1 << MXC_CCM_CCGR0_CG2_OFFSET |
-			      1 << MXC_CCM_CCGR0_CG3_OFFSET |
-			      3 << MXC_CCM_CCGR0_CG4_OFFSET |
-			      1 << MXC_CCM_CCGR0_CG8_OFFSET |
-			      1 << MXC_CCM_CCGR0_CG9_OFFSET |
-			      1 << MXC_CCM_CCGR0_CG12_OFFSET |
-			      1 << MXC_CCM_CCGR0_CG13_OFFSET |
-			      1 << MXC_CCM_CCGR0_CG14_OFFSET, MXC_CCM_CCGR0);
-	} else {
-		__raw_writel(1 << MXC_CCM_CCGR0_CG0_OFFSET |
-			      1 << MXC_CCM_CCGR0_CG1_OFFSET |
-			      1 << MXC_CCM_CCGR0_CG2_OFFSET |
-			      3 << MXC_CCM_CCGR0_CG3_OFFSET |
-			      3 << MXC_CCM_CCGR0_CG8_OFFSET |
-			      3 << MXC_CCM_CCGR0_CG9_OFFSET |
-			      1 << MXC_CCM_CCGR0_CG12_OFFSET |
-			      1 << MXC_CCM_CCGR0_CG13_OFFSET |
-			      3 << MXC_CCM_CCGR0_CG14_OFFSET, MXC_CCM_CCGR0);
-	}
-	__raw_writel(0, MXC_CCM_CCGR1);
-	__raw_writel(0, MXC_CCM_CCGR2);
-	__raw_writel(0, MXC_CCM_CCGR3);
-	__raw_writel(1 << MXC_CCM_CCGR4_CG8_OFFSET, MXC_CCM_CCGR4);
-
-	__raw_writel(1 << MXC_CCM_CCGR5_CG2_OFFSET |
-		     1 << MXC_CCM_CCGR5_CG6_1_OFFSET |
-		     1 << MXC_CCM_CCGR5_CG6_2_OFFSET |
-		     3 << MXC_CCM_CCGR5_CG7_OFFSET |
-		     1 << MXC_CCM_CCGR5_CG8_OFFSET |
-		     3 << MXC_CCM_CCGR5_CG9_OFFSET |
-		     1 << MXC_CCM_CCGR5_CG10_OFFSET |
-		     3 << MXC_CCM_CCGR5_CG11_OFFSET, MXC_CCM_CCGR5);
-
-	__raw_writel(1 << MXC_CCM_CCGR6_CG4_OFFSET, MXC_CCM_CCGR6);
-
-	ckil_clk.rate = ckil;
-	osc_clk.rate = osc;
-	ckih_clk.rate = ckih1;
-	ckih2_clk.rate = ckih2;
-
-	clk_tree_init();
-
-	for (clkp = mxc_clks; clkp < mxc_clks + ARRAY_SIZE(mxc_clks); clkp++)
-		clk_register(*clkp);
-
-	/*Setup the LPM bypass bits */
-	reg = __raw_readl(MXC_CCM_CLPCR);
-	reg |= MXC_CCM_CLPCR_BYPASS_HSC_LPM_HS
-		| MXC_CCM_CLPCR_BYPASS_IPU_LPM_HS
-		| MXC_CCM_CLPCR_BYPASS_RTIC_LPM_HS
-		| MXC_CCM_CLPCR_BYPASS_SCC_LPM_HS
-		| MXC_CCM_CLPCR_BYPASS_SDMA_LPM_HS;
-	__raw_writel(reg, MXC_CCM_CLPCR);
-
-	/* Disable the handshake with HSC block as its not
-	  * initialised right now.
-	  */
-	reg = __raw_readl(MXC_CCM_CCDR);
-	reg |= MXC_CCM_CCDR_HSC_HS_MASK;
-	__raw_writel(reg, MXC_CCM_CCDR);
-
-	/* This will propagate to all children and init all the clock rates */
-	propagate_rate(&osc_clk);
-	propagate_rate(&ckih_clk);
-	propagate_rate(&ckih2_clk);
-	propagate_rate(&ckil_clk);
-	propagate_rate(&pll1_sw_clk);
-	propagate_rate(&pll2_sw_clk);
-
-	clk_enable(&cpu_clk);
-	reg = __raw_readl(MXC_CCM_CBCDR) & MXC_CCM_CBCDR_DDR_HF_SEL;
-	reg >>= MXC_CCM_CBCDR_DDR_HF_SEL_OFFSET;
-
-	if (reg)
-		clk_set_parent(&ddr_clk, &ddr_hf_clk);
-	else
-		clk_set_parent(&ddr_clk, &axi_a_clk);
-
-	/* Initialise the parents to be axi_b, parents are set to
-	 * axi_a when the clocks are enabled.
-	 */
-	clk_set_parent(&vpu_clk[0], &axi_b_clk);
-	clk_set_parent(&vpu_clk[1], &axi_b_clk);
-	clk_set_parent(&gpu3d_clk, &axi_a_clk);
-	clk_set_parent(&gpu2d_clk, &axi_a_clk);
-
-	/* move cspi to 24MHz */
-	clk_set_parent(&cspi_main_clk, &lp_apm_clk);
-	clk_set_rate(&cspi_main_clk, 12000000);
-	/*move the spdif0 to spdif_xtal_ckl */
-	clk_set_parent(&spdif0_clk[0], &spdif_xtal_clk);
-	/*set the SPDIF dividers to 1 */
-	reg = __raw_readl(MXC_CCM_CDCDR);
-	reg &= ~MXC_CCM_CDCDR_SPDIF0_CLK_PODF_MASK;
-	reg &= ~MXC_CCM_CDCDR_SPDIF0_CLK_PRED_MASK;
-	__raw_writel(reg, MXC_CCM_CDCDR);
-
-	/* move the spdif1 to 24MHz */
-	clk_set_parent(&spdif1_clk[0], &spdif_xtal_clk);
-	/* set the spdif1 dividers to 1 */
-	reg = __raw_readl(MXC_CCM_CDCDR);
-	reg &= ~MXC_CCM_CDCDR_SPDIF1_CLK_PODF_MASK;
-	reg &= ~MXC_CCM_CDCDR_SPDIF1_CLK_PRED_MASK;
-	__raw_writel(reg, MXC_CCM_CDCDR);
-
-	/* Move SSI clocks to SSI_LP_APM clock */
-	clk_set_parent(&ssi_lp_apm_clk, &lp_apm_clk);
-
-	clk_set_parent(&ssi1_clk[0], &ssi_lp_apm_clk);
-	/* set the SSI dividers to divide by 2 */
-	reg = __raw_readl(MXC_CCM_CS1CDR);
-	reg &= ~MXC_CCM_CS1CDR_SSI1_CLK_PODF_MASK;
-	reg &= ~MXC_CCM_CS1CDR_SSI1_CLK_PRED_MASK;
-	reg |= 1 << MXC_CCM_CS1CDR_SSI1_CLK_PRED_OFFSET;
-	__raw_writel(reg, MXC_CCM_CS1CDR);
-
-	clk_set_parent(&ssi2_clk[0], &ssi_lp_apm_clk);
-	reg = __raw_readl(MXC_CCM_CS2CDR);
-	reg &= ~MXC_CCM_CS2CDR_SSI2_CLK_PODF_MASK;
-	reg &= ~MXC_CCM_CS2CDR_SSI2_CLK_PRED_MASK;
-	reg |= 1 << MXC_CCM_CS2CDR_SSI2_CLK_PRED_OFFSET;
-	__raw_writel(reg, MXC_CCM_CS2CDR);
-
-	/* Change the SSI_EXT1_CLK to be sourced from SSI1_CLK_ROOT */
-	clk_set_parent(&ssi_ext1_clk, &ssi1_clk[0]);
-	clk_set_parent(&ssi_ext2_clk, &ssi2_clk[0]);
-
-	/* move usb_phy_clk to 24MHz */
-	clk_set_parent(&usb_phy_clk, &osc_clk);
-
-	/* set usboh3_clk to pll2 */
-	clk_set_parent(&usboh3_clk[0], &pll2_sw_clk);
-	reg = __raw_readl(MXC_CCM_CSCDR1);
-	reg &= ~MXC_CCM_CSCDR1_USBOH3_CLK_PODF_MASK;
-	reg &= ~MXC_CCM_CSCDR1_USBOH3_CLK_PRED_MASK;
-	reg |= 4 << MXC_CCM_CSCDR1_USBOH3_CLK_PRED_OFFSET;
-	reg |= 1 << MXC_CCM_CSCDR1_USBOH3_CLK_PODF_OFFSET;
-	__raw_writel(reg, MXC_CCM_CSCDR1);
-
-	/* Set the current working point. */
-	cpu_wp_tbl = get_cpu_wp(&cpu_wp_nr);
-	/* Update the cpu working point table based on the PLL1 freq
-	 * at boot time
-	 */
-	if (pll1_main_clk.rate <= cpu_wp_tbl[cpu_wp_nr - 1].cpu_rate)
-		wp_cnt = 1;
-	else if (pll1_main_clk.rate <= cpu_wp_tbl[1].cpu_rate &&
-				pll1_main_clk.rate > cpu_wp_tbl[2].cpu_rate)
-		wp_cnt = cpu_wp_nr - 1;
-	else
-		wp_cnt = cpu_wp_nr;
-
-	cpu_wp_tbl[0].cpu_rate = pll1_main_clk.rate;
-
-	if (wp_cnt == 1) {
-		cpu_wp_tbl[0] = cpu_wp_tbl[cpu_wp_nr - 1];
-		memset(&cpu_wp_tbl[cpu_wp_nr - 1], 0, sizeof(struct cpu_wp));
-		memset(&cpu_wp_tbl[cpu_wp_nr - 2], 0, sizeof(struct cpu_wp));
-	} else if (wp_cnt < cpu_wp_nr) {
-		for (i = 0; i < wp_cnt; i++)
-			cpu_wp_tbl[i] = cpu_wp_tbl[i+1];
-		memset(&cpu_wp_tbl[i], 0, sizeof(struct cpu_wp));
-	}
-
-	if (wp_cnt < cpu_wp_nr) {
-		set_num_cpu_wp(wp_cnt);
-		cpu_wp_tbl = get_cpu_wp(&cpu_wp_nr);
-	}
-
-
-	for (j = 0; j < cpu_wp_nr; j++) {
-		if ((ddr_clk.parent == &ddr_hf_clk)) {
-			/* Change the CPU podf divider based on the boot up
-			 * pll1 rate.
-			 */
-			cpu_wp_tbl[j].cpu_podf =
-				(pll1_main_clk.rate / cpu_wp_tbl[j].cpu_rate)
-				- 1;
-			if (pll1_main_clk.rate/(cpu_wp_tbl[j].cpu_podf + 1) >
-					cpu_wp_tbl[j].cpu_rate) {
-				cpu_wp_tbl[j].cpu_podf++;
-				cpu_wp_tbl[j].cpu_rate =
-					 pll1_main_clk.rate/
-					 (1000 * (cpu_wp_tbl[j].cpu_podf + 1));
-				cpu_wp_tbl[j].cpu_rate *= 1000;
-			}
-			if (pll1_main_clk.rate/(cpu_wp_tbl[j].cpu_podf + 1) <
-						cpu_wp_tbl[j].cpu_rate) {
-				cpu_wp_tbl[j].cpu_rate = pll1_main_clk.rate;
-			}
-		}
-	cpu_wp_tbl[j].pll_rate = pll1_main_clk.rate;
-	}
-	/* Set the current working point. */
-	for (i = 0; i < cpu_wp_nr; i++) {
-		if (clk_get_rate(&cpu_clk) == cpu_wp_tbl[i].cpu_rate) {
-			cpu_curr_wp = i;
-			break;
-		}
-	}
-	if (i > cpu_wp_nr)
-		BUG();
-
-	/*Allow for automatic gating of the EMI internal clock.
-	 * If this is done, emi_intr CCGR bits should be set to 11.
-	 */
-	reg = __raw_readl((IO_ADDRESS(M4IF_BASE_ADDR) + 0x8c));
-	reg &= ~0x1;
-	__raw_writel(reg, (IO_ADDRESS(M4IF_BASE_ADDR) + 0x8c));
-
-	clk_set_parent(&arm_axi_clk, &axi_a_clk);
-	clk_set_parent(&ipu_clk[0], &axi_b_clk);
-
-	if (uart_at_24) {
-		/* Move UART to run from lp_apm */
-		clk_set_parent(&uart_main_clk, &lp_apm_clk);
-
-		/* Set the UART dividers to divide, so the UART_CLK is 24MHz. */
-		reg = __raw_readl(MXC_CCM_CSCDR1);
-		reg &= ~MXC_CCM_CSCDR1_UART_CLK_PODF_MASK;
-		reg &= ~MXC_CCM_CSCDR1_UART_CLK_PRED_MASK;
-		reg |= (0 << MXC_CCM_CSCDR1_UART_CLK_PRED_OFFSET) |
-		    (0 << MXC_CCM_CSCDR1_UART_CLK_PODF_OFFSET);
-		__raw_writel(reg, MXC_CCM_CSCDR1);
-	} else {
-		/* Move UART to run from PLL1 */
-		clk_set_parent(&uart_main_clk, &pll1_sw_clk);
-
-		/* Set the UART dividers to divide,
-		 * so the UART_CLK is 66.5MHz.
-		 */
-		reg = __raw_readl(MXC_CCM_CSCDR1);
-		reg &= ~MXC_CCM_CSCDR1_UART_CLK_PODF_MASK;
-		reg &= ~MXC_CCM_CSCDR1_UART_CLK_PRED_MASK;
-		reg |= (5 << MXC_CCM_CSCDR1_UART_CLK_PRED_OFFSET) |
-		    (1 << MXC_CCM_CSCDR1_UART_CLK_PODF_OFFSET);
-		__raw_writel(reg, MXC_CCM_CSCDR1);
-	}
-
-	propagate_rate(&osc_clk);
-	propagate_rate(&pll1_sw_clk);
-	propagate_rate(&pll2_sw_clk);
-
-	clk_set_parent(&emi_slow_clk, &ahb_clk);
-	clk_set_rate(&emi_slow_clk, clk_round_rate(&emi_slow_clk, 130000000));
-
-	/* Change the NFC clock rate to be 1:4 ratio with emi clock. */
-	clk_set_rate(&emi_enfc_clk, clk_round_rate(&emi_enfc_clk,
-			(clk_get_rate(&emi_slow_clk))/4));
-
-	base = ioremap(GPT1_BASE_ADDR, SZ_4K);
-	mxc_timer_init(&gpt_clk[0], base, MXC_INT_GPT);
-	return 0;
-}
-
-/*!
- * Setup cpu clock based on working point.
- * @param	wp	cpu freq working point
- * @return		0 on success or error code on failure.
- */
-static int cpu_clk_set_wp(int wp)
-{
-	struct cpu_wp *p;
-	u32 reg;
-	u32 stat;
-
-	if (wp == cpu_curr_wp)
-		return 0;
-
-	p = &cpu_wp_tbl[wp];
-
-	/*
-	 * If DDR clock is sourced from PLL1, we cannot drop PLL1 freq.
-	 * Use the ARM_PODF to change the freq of the core, leave the PLL1
-	 * freq unchanged.
-	 */
-	if (ddr_clk.parent == &ddr_hf_clk) {
-		reg = __raw_readl(MXC_CCM_CACRR);
-		reg &= ~MXC_CCM_CACRR_ARM_PODF_MASK;
-		reg |= cpu_wp_tbl[wp].cpu_podf << MXC_CCM_CACRR_ARM_PODF_OFFSET;
-		__raw_writel(reg, MXC_CCM_CACRR);
-		cpu_curr_wp = wp;
-		cpu_clk.rate = cpu_wp_tbl[wp].cpu_rate;
-	} else {
-		struct timespec nstimeofday;
-		struct timespec curtime;
-
-		/* Change the ARM clock to requested frequency */
-		/* First move the ARM clock to step clock which is running
-		 * at 24MHz.
-		 */
-
-		/* Change the source of pll1_sw_clk to be the step_clk */
-		reg = __raw_readl(MXC_CCM_CCSR);
-		reg |= MXC_CCM_CCSR_PLL1_SW_CLK_SEL;
-		__raw_writel(reg, MXC_CCM_CCSR);
-
-		/* Stop the PLL */
-		reg = __raw_readl(MXC_DPLL1_BASE + MXC_PLL_DP_CTL);
-		reg &= ~MXC_PLL_DP_CTL_UPEN;
-		__raw_writel(reg, MXC_DPLL1_BASE + MXC_PLL_DP_CTL);
-
-		/* PDF and MFI */
-		reg = p->pdf | p->mfi << MXC_PLL_DP_OP_MFI_OFFSET;
-		__raw_writel(reg, MXC_DPLL1_BASE + MXC_PLL_DP_OP);
-
-		/* MFD */
-		__raw_writel(p->mfd, MXC_DPLL1_BASE + MXC_PLL_DP_MFD);
-
-		/* MFI */
-		__raw_writel(p->mfn, MXC_DPLL1_BASE + MXC_PLL_DP_MFN);
-
-		reg = __raw_readl(MXC_DPLL1_BASE + MXC_PLL_DP_CTL);
-		reg |= MXC_PLL_DP_CTL_UPEN;
-		/* Set the UPEN bits */
-		__raw_writel(reg, MXC_DPLL1_BASE + MXC_PLL_DP_CTL);
-		/* Forcefully restart the PLL */
-		reg |= MXC_PLL_DP_CTL_RST;
-		__raw_writel(reg, MXC_DPLL1_BASE + MXC_PLL_DP_CTL);
-
-		/* Wait for the PLL to lock */
-		getnstimeofday(&nstimeofday);
-		do {
-			getnstimeofday(&curtime);
-			if ((curtime.tv_nsec - nstimeofday.tv_nsec) > SPIN_DELAY)
-				panic("pll1 relock failed\n");
-			stat = __raw_readl(MXC_DPLL1_BASE + MXC_PLL_DP_CTL) &
-			    MXC_PLL_DP_CTL_LRF;
-		} while (!stat);
-
-		reg = __raw_readl(MXC_CCM_CCSR);
-		/* Move the PLL1 back to the pll1_main_clk */
-		reg &= ~MXC_CCM_CCSR_PLL1_SW_CLK_SEL;
-		__raw_writel(reg, MXC_CCM_CCSR);
-
-		cpu_curr_wp = wp;
-
-		pll1_sw_clk.rate = cpu_wp_tbl[wp].cpu_rate;
-		pll1_main_clk.rate = pll1_sw_clk.rate;
-		cpu_clk.rate = pll1_sw_clk.rate;
-	}
-
-#if defined(CONFIG_CPU_FREQ_IMX)
-	cpufreq_trig_needed = 1;
-#endif
-	return 0;
-}
diff --git a/arch/arm/mach-mx51/devices.c b/arch/arm/mach-mx51/devices.c
deleted file mode 100644
index d625c4b0ff61..000000000000
--- a/arch/arm/mach-mx51/devices.c
+++ /dev/null
@@ -1,1352 +0,0 @@
-/*
- * Copyright 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/io.h>
-#include <linux/dma-mapping.h>
-#include <linux/platform_device.h>
-#include <linux/clk.h>
-#include <linux/delay.h>
-#include <linux/uio_driver.h>
-#include <linux/mxc_scc2_driver.h>
-#include <linux/iram_alloc.h>
-#include <mach/common.h>
-#include <mach/hardware.h>
-#include <mach/gpio.h>
-#include <mach/sdma.h>
-#include "sdma_script_code.h"
-#include "crm_regs.h"
-#include "mx51_pins.h"
-#include "devices.h"
-#include "displays/displays.h"
-#include "linux/fb.h"
-
-/* Flag used to indicate when IRAM has been initialized */
-int iram_ready;
-/* Flag used to indicate if dvfs_core is active. */
-int dvfs_core_is_active;
-
-void mxc_sdma_get_script_info(sdma_script_start_addrs * sdma_script_addr)
-{
-	/* AP<->BP */
-	sdma_script_addr->mxc_sdma_ap_2_ap_addr = ap_2_ap_ADDR;
-	sdma_script_addr->mxc_sdma_ap_2_bp_addr = -1;
-	sdma_script_addr->mxc_sdma_bp_2_ap_addr = -1;
-	sdma_script_addr->mxc_sdma_ap_2_ap_fixed_addr = -1;
-
-	/*misc */
-	sdma_script_addr->mxc_sdma_loopback_on_dsp_side_addr = -1;
-	sdma_script_addr->mxc_sdma_mcu_interrupt_only_addr = -1;
-
-	/* firi */
-	sdma_script_addr->mxc_sdma_firi_2_per_addr = -1;
-	sdma_script_addr->mxc_sdma_firi_2_mcu_addr = -1;
-	sdma_script_addr->mxc_sdma_per_2_firi_addr = -1;
-	sdma_script_addr->mxc_sdma_mcu_2_firi_addr = -1;
-
-	/* uart */
-	sdma_script_addr->mxc_sdma_uart_2_per_addr = uart_2_per_ADDR;
-	sdma_script_addr->mxc_sdma_uart_2_mcu_addr = uart_2_mcu_ADDR;
-
-	/* UART SH */
-	sdma_script_addr->mxc_sdma_uartsh_2_per_addr = uartsh_2_per_ADDR;
-	sdma_script_addr->mxc_sdma_uartsh_2_mcu_addr = uartsh_2_mcu_ADDR;
-
-	/* SHP */
-	sdma_script_addr->mxc_sdma_per_2_shp_addr = per_2_shp_ADDR;
-	sdma_script_addr->mxc_sdma_shp_2_per_addr = shp_2_per_ADDR;
-	sdma_script_addr->mxc_sdma_mcu_2_shp_addr = mcu_2_shp_ADDR;
-	sdma_script_addr->mxc_sdma_shp_2_mcu_addr = shp_2_mcu_ADDR;
-
-	/* ATA */
-	sdma_script_addr->mxc_sdma_mcu_2_ata_addr = mcu_2_ata_ADDR;
-	sdma_script_addr->mxc_sdma_ata_2_mcu_addr = ata_2_mcu_ADDR;
-
-	/* app */
-	sdma_script_addr->mxc_sdma_app_2_per_addr = app_2_per_ADDR;
-	sdma_script_addr->mxc_sdma_app_2_mcu_addr = app_2_mcu_ADDR;
-	sdma_script_addr->mxc_sdma_per_2_app_addr = per_2_app_ADDR;
-	sdma_script_addr->mxc_sdma_mcu_2_app_addr = mcu_2_app_ADDR;
-
-	/* MSHC */
-	sdma_script_addr->mxc_sdma_mshc_2_mcu_addr = -1;
-	sdma_script_addr->mxc_sdma_mcu_2_mshc_addr = -1;
-
-	/* spdif */
-	sdma_script_addr->mxc_sdma_spdif_2_mcu_addr = -1;
-	sdma_script_addr->mxc_sdma_mcu_2_spdif_addr = mcu_2_spdif_ADDR;
-
-	/* IPU */
-	sdma_script_addr->mxc_sdma_ext_mem_2_ipu_addr = ext_mem__ipu_ram_ADDR;
-
-	/* DVFS */
-	sdma_script_addr->mxc_sdma_dptc_dvfs_addr = -1;
-
-	/* core */
-	sdma_script_addr->mxc_sdma_start_addr = (unsigned short *)sdma_code;
-	sdma_script_addr->mxc_sdma_ram_code_start_addr = RAM_CODE_START_ADDR;
-	sdma_script_addr->mxc_sdma_ram_code_size = RAM_CODE_SIZE;
-}
-
-#if defined(CONFIG_W1_MASTER_MXC) || defined(CONFIG_W1_MASTER_MXC_MODULE)
-
-static struct mxc_w1_config mxc_w1_master_resources = {
-	{
-		.start = OWIRE_BASE_ADDR,
-		.end   = OWIRE_BASE_ADDR + SZ_4K - 1,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_OWIRE,
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-static struct platform_device mxc_w1_devices = {
-	.name = "mxc_w1",
-	.id = 0,
-	.num_resources = ARRAY_SIZE(mxc_w1_master_resources),
-	.resource = mxc_w1_master_resources,
-};
-#endif
-
-static struct resource mxc_kpp_resources[] = {
-	{
-		.start = KPP_BASE_ADDR,
-		.end = KPP_BASE_ADDR + SZ_4K - 1,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_KPP,
-		.end = MXC_INT_KPP,
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-struct platform_device mxc_keypad_device = {
-	.name = "mxc_keypad",
-	.id = 0,
-	.num_resources = ARRAY_SIZE(mxc_kpp_resources),
-	.resource = mxc_kpp_resources,
-};
-
-static struct resource rtc_resources[] = {
-	{
-	 .start = SRTC_BASE_ADDR,
-	 .end = SRTC_BASE_ADDR + 0x40,
-	 .flags = IORESOURCE_MEM,
-	 },
-	{
-	 .start = MXC_INT_SRTC_NTZ,
-	 .flags = IORESOURCE_IRQ,
-	 },
-};
-
-struct platform_device mxc_rtc_device = {
-	.name = "mxc_rtc",
-	.id = 0,
-	.num_resources = ARRAY_SIZE(rtc_resources),
-	.resource = rtc_resources,
-};
-
-static struct resource imx_nfc_resources[] = {
-	{
-		.flags = IORESOURCE_MEM,
-		.start = NFC_BASE_ADDR_AXI + 0x0000,
-		.end   = NFC_BASE_ADDR_AXI + 0x1200 - 1,
-		.name  = IMX_NFC_BUFFERS_ADDR_RES_NAME,
-	},
-	{
-		.flags = IORESOURCE_MEM,
-		.start = NFC_BASE_ADDR_AXI + 0x1E00,
-		.end   = NFC_BASE_ADDR_AXI + 0x1E44 - 1,
-		.name  = IMX_NFC_PRIMARY_REGS_ADDR_RES_NAME,
-	},
-	{
-		.flags = IORESOURCE_MEM,
-		.start = NFC_BASE_ADDR + 0x00,
-		.end   = NFC_BASE_ADDR + 0x34 - 1,
-		.name  = IMX_NFC_SECONDARY_REGS_ADDR_RES_NAME,
-	},
-	{
-		.flags = IORESOURCE_IRQ,
-		.start = MXC_INT_NFC,
-		.end   = MXC_INT_NFC,
-		.name  = IMX_NFC_INTERRUPT_RES_NAME,
-	},
-};
-
-struct platform_device imx_nfc_device = {
-	.name = IMX_NFC_DRIVER_NAME,
-	.id = 0,
-	.resource      = imx_nfc_resources,
-	.num_resources = ARRAY_SIZE(imx_nfc_resources),
-};
-
-static struct resource wdt_resources[] = {
-	{
-	 .start = WDOG1_BASE_ADDR,
-	 .end = WDOG1_BASE_ADDR + 0x30,
-	 .flags = IORESOURCE_MEM,
-	 },
-};
-
-struct platform_device mxc_wdt_device = {
-	.name = "mxc_wdt",
-	.id = 0,
-	.num_resources = ARRAY_SIZE(wdt_resources),
-	.resource = wdt_resources,
-};
-
-static struct resource pwm1_resources[] = {
-	{
-		.start = PWM1_BASE_ADDR,
-		.end = PWM1_BASE_ADDR + 0x14,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_PWM1,
-		.end = MXC_INT_PWM1,
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-struct platform_device mxc_pwm1_device = {
-	.name = "mxc_pwm",
-	.id = 0,
-	.num_resources = ARRAY_SIZE(pwm1_resources),
-	.resource = pwm1_resources,
-};
-
-static struct resource pwm2_resources[] = {
-	{
-		.start = PWM2_BASE_ADDR,
-		.end = PWM2_BASE_ADDR + 0x14,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_PWM2,
-		.end = MXC_INT_PWM2,
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-struct platform_device mxc_pwm2_device = {
-	.name = "mxc_pwm",
-	.id = 1,
-	.num_resources = ARRAY_SIZE(pwm2_resources),
-	.resource = pwm2_resources,
-};
-
-struct platform_device mxc_pwm_backlight_device = {
-	.name = "pwm-backlight",
-	.id = -1,
-};
-
-static struct resource ipu_resources[] = {
-	{
-	 .start = IPU_CTRL_BASE_ADDR,
-	 .end = IPU_CTRL_BASE_ADDR + SZ_512M,
-	 .flags = IORESOURCE_MEM,
-	 },
-	{
-	 .start = MXC_INT_IPU_SYN,
-	 .flags = IORESOURCE_IRQ,
-	 },
-	{
-	 .start = MXC_INT_IPU_ERR,
-	 .flags = IORESOURCE_IRQ,
-	 },
-};
-
-struct platform_device mxc_ipu_device = {
-	.name = "mxc_ipu",
-	.id = -1,
-	.num_resources = ARRAY_SIZE(ipu_resources),
-	.resource = ipu_resources,
-};
-
-static struct resource vpu_resources[] = {
-	{
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = (resource_size_t)IO_ADDRESS(SRC_BASE_ADDR),
-		.end = (resource_size_t)IO_ADDRESS(SRC_BASE_ADDR),
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start	= MXC_INT_VPU_IDLE,
-		.end	= MXC_INT_VPU_IDLE,
-		.flags	= IORESOURCE_IRQ,
-	},
-};
-
-struct platform_device mxcvpu_device = {
-	.name = "mxc_vpu",
-	.id = 0,
-	.num_resources = ARRAY_SIZE(vpu_resources),
-	.resource = vpu_resources,
-};
-
-static struct resource mxcspi1_resources[] = {
-	{
-		.start = CSPI1_BASE_ADDR,
-		.end = CSPI1_BASE_ADDR + SZ_4K - 1,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_CSPI1,
-		.end = MXC_INT_CSPI1,
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-struct platform_device mxcspi1_device = {
-	.name = "mxc_spi",
-	.id = 0,
-	.num_resources = ARRAY_SIZE(mxcspi1_resources),
-	.resource = mxcspi1_resources,
-};
-
-
-static struct resource mxcspi2_resources[] = {
-	{
-		.start = CSPI2_BASE_ADDR,
-		.end = CSPI2_BASE_ADDR + SZ_4K - 1,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_CSPI2,
-		.end = MXC_INT_CSPI2,
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-struct platform_device mxcspi2_device = {
-	.name = "mxc_spi",
-	.id = 1,
-	.num_resources = ARRAY_SIZE(mxcspi2_resources),
-	.resource = mxcspi2_resources,
-};
-
-static struct resource mxcspi3_resources[] = {
-	{
-		.start = CSPI3_BASE_ADDR,
-		.end = CSPI3_BASE_ADDR + SZ_4K - 1,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_CSPI,
-		.end = MXC_INT_CSPI,
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-struct platform_device mxcspi3_device = {
-	.name = "mxc_spi",
-	.id = 2,
-	.num_resources = ARRAY_SIZE(mxcspi3_resources),
-	.resource = mxcspi3_resources,
-};
-
-static struct resource mxci2c1_resources[] = {
-	{
-		.start = I2C1_BASE_ADDR,
-		.end = I2C1_BASE_ADDR + SZ_4K - 1,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_I2C1,
-		.end = MXC_INT_I2C1,
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-static struct resource mxci2c2_resources[] = {
-	{
-		.start = I2C2_BASE_ADDR,
-		.end = I2C2_BASE_ADDR + SZ_4K - 1,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_I2C2,
-		.end = MXC_INT_I2C2,
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-struct platform_device mxci2c_devices[] = {
-	{
-		.name = "mxc_i2c",
-		.id = 0,
-		.num_resources = ARRAY_SIZE(mxci2c1_resources),
-		.resource = mxci2c1_resources,
-	},
-	{
-		.name = "mxc_i2c",
-		.id = 1,
-		.num_resources = ARRAY_SIZE(mxci2c2_resources),
-		.resource = mxci2c2_resources,
-	},
-};
-
-static struct resource mxci2c_hs_resources[] = {
-	{
-		.start = HSI2C_DMA_BASE_ADDR,
-		.end = HSI2C_DMA_BASE_ADDR + SZ_16K - 1,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_HS_I2C,
-		.end = MXC_INT_HS_I2C,
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-struct platform_device mxci2c_hs_device = {
-	.name = "mxc_i2c_hs",
-	.id = 3,
-	.num_resources = ARRAY_SIZE(mxci2c_hs_resources),
-	.resource = mxci2c_hs_resources
-};
-
-static struct resource ssi1_resources[] = {
-	{
-		.start = SSI1_BASE_ADDR,
-		.end = SSI1_BASE_ADDR + 0x5C,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_SSI1,
-		.end = MXC_INT_SSI1,
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-struct platform_device mxc_ssi1_device = {
-	.name = "mxc_ssi",
-	.id = 0,
-	.num_resources = ARRAY_SIZE(ssi1_resources),
-	.resource = ssi1_resources,
-};
-
-static struct resource ssi2_resources[] = {
-	{
-		.start = SSI2_BASE_ADDR,
-		.end = SSI2_BASE_ADDR + 0x5C,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_SSI2,
-		.end = MXC_INT_SSI2,
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-struct platform_device mxc_ssi2_device = {
-	.name = "mxc_ssi",
-	.id = 1,
-	.num_resources = ARRAY_SIZE(ssi2_resources),
-	.resource = ssi2_resources,
-};
-
-static struct resource tve_resources[] = {
-	{
-		.start = TVE_BASE_ADDR,
-		.end = TVE_BASE_ADDR + SZ_4K - 1,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_TVE,
-		.end = MXC_INT_TVE,
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-struct platform_device mxc_tve_device = {
-	.name = "tve",
-	.num_resources = ARRAY_SIZE(tve_resources),
-	.resource = tve_resources,
-};
-
-static struct resource dvfs_core_resources[] = {
-	{
-		.start = (resource_size_t)MXC_DVFS_CORE_BASE,
-		.end = (resource_size_t)MXC_DVFS_CORE_BASE + 4 * SZ_16 - 1,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_GPC1,
-		.end = MXC_INT_GPC1,
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-struct platform_device mxc_dvfs_core_device = {
-	.name = "mxc_dvfs_core",
-	.id = 0,
-	.num_resources = ARRAY_SIZE(dvfs_core_resources),
-	.resource = dvfs_core_resources,
-};
-
-static struct resource dvfs_per_resources[] = {
-	{
-		.start = DVFSPER_BASE_ADDR,
-		.end = DVFSPER_BASE_ADDR + 2 * SZ_16 - 1,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_GPC1,
-		.end = MXC_INT_GPC1,
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-struct platform_device mxc_dvfs_per_device = {
-	 .name = "mxc_dvfsper",
-	 .id = 0,
-	 .num_resources = ARRAY_SIZE(dvfs_per_resources),
-	 .resource = dvfs_per_resources,
-};
-
-struct mxc_gpio_port mxc_gpio_ports[] = {
-	{
-		.chip.label = "gpio-0",
-		.base = IO_ADDRESS(GPIO1_BASE_ADDR),
-		.irq = MXC_INT_GPIO1_LOW,
-		.irq_high = MXC_INT_GPIO1_HIGH,
-		.virtual_irq_start = MXC_GPIO_IRQ_START
-	},
-	{
-		.chip.label = "gpio-1",
-		.base = IO_ADDRESS(GPIO2_BASE_ADDR),
-		.irq = MXC_INT_GPIO2_LOW,
-		.irq_high = MXC_INT_GPIO2_HIGH,
-		.virtual_irq_start = MXC_GPIO_IRQ_START + 32 * 1
-	},
-	{
-		.chip.label = "gpio-2",
-		.base = IO_ADDRESS(GPIO3_BASE_ADDR),
-		.irq = MXC_INT_GPIO3_LOW,
-		.irq_high = MXC_INT_GPIO3_HIGH,
-		.virtual_irq_start = MXC_GPIO_IRQ_START + 32 * 2
-	},
-	{
-		.chip.label = "gpio-3",
-		.base = IO_ADDRESS(GPIO4_BASE_ADDR),
-		.irq = MXC_INT_GPIO4_LOW,
-		.irq_high = MXC_INT_GPIO4_HIGH,
-		.virtual_irq_start = MXC_GPIO_IRQ_START + 32 * 3
-	},
-};
-
-int __init mxc_register_gpios(void)
-{
-	return mxc_gpio_init(mxc_gpio_ports, ARRAY_SIZE(mxc_gpio_ports));
-}
-
-static struct resource spdif_resources[] = {
-	{
-		.start = SPDIF_BASE_ADDR,
-		.end = SPDIF_BASE_ADDR + 0x50,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_SPDIF,
-		.end = MXC_INT_SPDIF,
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-struct platform_device mxc_alsa_spdif_device = {
-	.name = "mxc_alsa_spdif",
-	.id = 0,
-	.num_resources = ARRAY_SIZE(spdif_resources),
-	.resource = spdif_resources,
-};
-
-
-struct platform_device mx51_lpmode_device = {
-	.name = "mx51_lpmode",
-	.id = 0,
-};
-
-
-struct platform_device busfreq_device = {
-	.name = "busfreq",
-	.id = 0,
-};
-
-static struct resource mxc_m4if_resources[] = {
-	{
-	 .start = M4IF_BASE_ADDR,
-	 .end = M4IF_BASE_ADDR + SZ_4K - 1,
-	 .flags = IORESOURCE_MEM,
-	 },
-};
-
-struct platform_device sdram_autogating_device = {
-	.name = "sdram_autogating",
-	.id = 0,
-	.resource = mxc_m4if_resources,
-	.num_resources = ARRAY_SIZE(mxc_m4if_resources),
-};
-
-static struct resource mxc_iim_resources[] = {
-	{
-	 .start = IIM_BASE_ADDR,
-	 .end = IIM_BASE_ADDR + SZ_4K - 1,
-	 .flags = IORESOURCE_MEM,
-	 },
-};
-
-struct platform_device mxc_iim_device = {
-	.name = "mxc_iim",
-	.id = 0,
-	.num_resources = ARRAY_SIZE(mxc_iim_resources),
-	.resource = mxc_iim_resources
-};
-
-static struct resource mxc_sim_resources[] = {
-	{
-		.start = SIM_BASE_ADDR,
-		.end = SIM_BASE_ADDR + SZ_4K - 1,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_SIM_IPB,
-		.end = MXC_INT_SIM_IPB,
-		.flags = IORESOURCE_IRQ,
-	},
-	{
-		.start = MXC_INT_SIM_DAT,
-		.end = MXC_INT_SIM_DAT,
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-struct platform_device mxc_sim_device = {
-	.name = "mxc_sim",
-	.id = 0,
-	.num_resources = ARRAY_SIZE(mxc_sim_resources),
-	.resource = mxc_sim_resources,
-};
-
-#if defined(CONFIG_MMC_IMX_ESDHCI) || defined(CONFIG_MMC_IMX_ESDHCI_MODULE)
-
-/**
- * Resource definition for the SDHC1
- */
-static struct resource mxcsdhc1_resources[] = {
-	{
-		.start = MMC_SDHC1_BASE_ADDR,
-		.end   = MMC_SDHC1_BASE_ADDR + SZ_4K - 1,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_MMC_SDHC1,
-		.end   = MXC_INT_MMC_SDHC1,
-		.flags = IORESOURCE_IRQ,
-	},
-	{
-		.start = IOMUX_TO_IRQ(MX51_PIN_GPIO1_0),
-		.end   = IOMUX_TO_IRQ(MX51_PIN_GPIO1_0),
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-/**
- * Resource definition for the SDHC3
- */
-static struct resource mxcsdhc3_resources[] = {
-	{
-		.start = MMC_SDHC3_BASE_ADDR,
-		.end   = MMC_SDHC3_BASE_ADDR + SZ_4K - 1,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_MMC_SDHC3,
-		.end   = MXC_INT_MMC_SDHC3,
-		.flags = IORESOURCE_IRQ,
-	},
-	{
-		.start = IOMUX_TO_IRQ(MX51_PIN_GPIO_NAND),
-		.end   = IOMUX_TO_IRQ(MX51_PIN_GPIO_NAND),
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-/*! Device Definition for MXC SDHC1 */
-struct platform_device mxcsdhc1_device = {
-	.name = "mxsdhci",
-	.id = 0,
-	.num_resources = ARRAY_SIZE(mxcsdhc1_resources),
-	.resource = mxcsdhc1_resources,
-};
-
-/*! Device Definition for MXC SDHC3 */
-struct platform_device mxcsdhc3_device = {
-	.name = "mxsdhci",
-	.id = 2,
-	.num_resources = ARRAY_SIZE(mxcsdhc3_resources),
-	.resource = mxcsdhc3_resources,
-};
-
-#endif
-
-static struct resource pata_fsl_resources[] = {
-	{
-		.start = ATA_BASE_ADDR,
-		.end = ATA_BASE_ADDR + 0x000000C8,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_ATA,
-		.end = MXC_INT_ATA,
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-struct platform_device pata_fsl_device = {
-	.name = "pata_fsl",
-	.id = -1,
-	.num_resources = ARRAY_SIZE(pata_fsl_resources),
-	.resource = pata_fsl_resources,
-	.dev = {
-		.coherent_dma_mask = DMA_BIT_MASK(32),
-	},
-};
-
-static u64 usb_dma_mask = DMA_BIT_MASK(32);
-
-static struct resource usbotg_resources[] = {
-	{
-		.start = OTG_BASE_ADDR,
-		.end = OTG_BASE_ADDR + 0x1ff,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_USB_OTG,
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-static struct resource usbotg_xcvr_resources[] = {
-	{
-		.start = OTG_BASE_ADDR,
-		.end = OTG_BASE_ADDR + 0x1ff,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_USB_OTG,
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-struct platform_device mxc_usbdr_udc_device = {
-	.name = "fsl-usb2-udc",
-	.id   = -1,
-	.dev  = {
-		.dma_mask = &usb_dma_mask,
-		.coherent_dma_mask = DMA_BIT_MASK(32),
-	},
-	.resource      = usbotg_resources,
-	.num_resources = ARRAY_SIZE(usbotg_resources),
-};
-
-struct platform_device mxc_usbdr_otg_device = {
-	.name = "fsl-usb2-otg",
-	.id = -1,
-	.dev = {
-		.dma_mask = &usb_dma_mask,
-		.coherent_dma_mask = DMA_BIT_MASK(32),
-	},
-	.resource      = usbotg_xcvr_resources,
-	.num_resources = ARRAY_SIZE(usbotg_xcvr_resources),
-};
-
-struct platform_device mxc_usbdr_host_device = {
-	.name = "fsl-ehci",
-	.id = 0,
-	.num_resources = ARRAY_SIZE(usbotg_resources),
-	.resource = usbotg_resources,
-	.dev = {
-		.dma_mask = &usb_dma_mask,
-		.coherent_dma_mask = DMA_BIT_MASK(32),
-	},
-};
-
-static struct resource usbh1_resources[] = {
-	{
-		.start = OTG_BASE_ADDR + 0x200,
-		.end = OTG_BASE_ADDR + 0x200 + 0x1ff,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_USB_H1,
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-struct platform_device mxc_usbh1_device = {
-	.name = "fsl-ehci",
-	.id = 1,
-	.num_resources = ARRAY_SIZE(usbh1_resources),
-	.resource = usbh1_resources,
-	.dev = {
-		.dma_mask = &usb_dma_mask,
-		.coherent_dma_mask = DMA_BIT_MASK(32),
-	},
-};
-
-static struct resource usbh2_resources[] = {
-	{
-		.start = OTG_BASE_ADDR + 0x400,
-		.end = OTG_BASE_ADDR + 0x400 + 0x1ff,
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = MXC_INT_USB_H2,
-		.flags = IORESOURCE_IRQ,
-	},
-};
-
-struct platform_device mxc_usbh2_device = {
-	.name = "fsl-ehci",
-	.id = 2,
-	.num_resources = ARRAY_SIZE(usbh2_resources),
-	.resource = usbh2_resources,
-	.dev = {
-		.dma_mask = &usb_dma_mask,
-		.coherent_dma_mask = DMA_BIT_MASK(32),
-	},
-};
-
-static struct resource mxc_gpu_resources[] = {
-	{
-		.start = MXC_INT_GPU2_IRQ,
-		.end = MXC_INT_GPU2_IRQ,
-		.name = "gpu_2d_irq",
-		.flags = IORESOURCE_IRQ,
-	},
-	{
-		.start = MXC_INT_GPU,
-		.end = MXC_INT_GPU,
-		.name = "gpu_3d_irq",
-		.flags = IORESOURCE_IRQ,
-	},
-	{
-		.start = GPU2D_BASE_ADDR,
-		.end = GPU2D_BASE_ADDR + SZ_4K - 1,
-		.name = "gpu_2d_registers",
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = GPU_BASE_ADDR,
-		.end = GPU_BASE_ADDR + SZ_128K - 1,
-		.name = "gpu_3d_registers",
-		.flags = IORESOURCE_MEM,
-	},
-	{
-		.start = GPU_GMEM_BASE_ADDR,
-		.end = GPU_GMEM_BASE_ADDR + SZ_128K - 1,
-		.name = "gpu_graphics_mem",
-		.flags = IORESOURCE_MEM,
-	},
-};
-
-struct platform_device gpu_device = {
-	.name = "mxc_gpu",
-	.id = 0,
-	.num_resources = ARRAY_SIZE(mxc_gpu_resources),
-	.resource = mxc_gpu_resources,
-};
-
-
-#if defined(CONFIG_UIO_PDRV_GENIRQ) || defined(CONFIG_UIO_PDRV_GENIRQ_MODULE)
-static struct clk *gpu_clk;
-
-static struct resource mxc_gpu2d_resources[] = {
-	{
-	 .start = GPU2D_BASE_ADDR,
-	 .end = GPU2D_BASE_ADDR + SZ_4K - 1,
-	 .flags = IORESOURCE_MEM,
-	 },
-	{
-	 .flags = IORESOURCE_MEM,
-	 },
-	{
-	 .flags = IORESOURCE_MEM,
-	 },
-};
-
-int gpu2d_open(struct uio_info *info, struct inode *inode)
-{
-	gpu_clk = clk_get(NULL, "gpu2d_clk");
-	if (IS_ERR(gpu_clk))
-		return PTR_ERR(gpu_clk);
-
-	return clk_enable(gpu_clk);
-}
-
-int gpu2d_release(struct uio_info *info, struct inode *inode)
-{
-	if (IS_ERR(gpu_clk))
-		return PTR_ERR(gpu_clk);
-
-	clk_disable(gpu_clk);
-	clk_put(gpu_clk);
-	return 0;
-}
-
-static int gpu2d_mmap(struct uio_info *info, struct vm_area_struct *vma)
-{
-	int mi = vma->vm_pgoff;
-	if (mi < 0)
-		return -EINVAL;
-
-	vma->vm_flags |= VM_IO | VM_RESERVED;
-	vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
-
-	return remap_pfn_range(vma,
-			       vma->vm_start,
-			       info->mem[mi].addr >> PAGE_SHIFT,
-			       vma->vm_end - vma->vm_start,
-			       vma->vm_page_prot);
-}
-
-struct platform_device mxc_gpu2d_device = {
-	.name = "uio_pdrv_genirq",
-	.dev = {
-		.coherent_dma_mask = DMA_BIT_MASK(32),
-		},
-	.num_resources = ARRAY_SIZE(mxc_gpu2d_resources),
-	.resource = mxc_gpu2d_resources,
-};
-
-static inline void mxc_init_gpu2d(void)
-{
-	dma_alloc_coherent(&mxc_gpu2d_device.dev, SZ_8K, &mxc_gpu2d_resources[1].start, GFP_DMA);
-	mxc_gpu2d_resources[1].end = mxc_gpu2d_resources[1].start + SZ_8K - 1;
-
-	dma_alloc_coherent(&mxc_gpu2d_device.dev, 88 * SZ_1K, &mxc_gpu2d_resources[2].start, GFP_DMA);
-	mxc_gpu2d_resources[2].end = mxc_gpu2d_resources[2].start + (88 * SZ_1K) - 1;
-}
-#endif
-
-/* MTD NAND flash */
-#if defined(CONFIG_MTD_NAND_MXC) \
-	|| defined(CONFIG_MTD_NAND_MXC_MODULE) \
-	|| defined(CONFIG_MTD_NAND_MXC_V2) \
-	|| defined(CONFIG_MTD_NAND_MXC_V2_MODULE) \
-	|| defined(CONFIG_MTD_NAND_MXC_V3) \
-	|| defined(CONFIG_MTD_NAND_MXC_V3_MODULE)
-
-struct platform_device mxc_nandv2_mtd_device = {
-	.name = "mxc_nandv2_flash",
-	.id = 0,
-};
-#endif
-
-#if defined(CONFIG_SND_SOC_IMX_CCWMX51_WM8753) || defined(CONFIG_SND_SOC_IMX_CCWMX51_WM8753_MODULE)
-struct platform_device mxc_wm8753_device = {
-	.name = "ccwmx51js",
-};
-#endif
-
-#if defined(CONFIG_SMSC9118) || defined(CONFIG_SMSC9118_MODULE)
-static struct resource smsc911x_device_resources[] = {
-	{
-		.name	= "smsc911x-memory",
-		.start	= CS5_BASE_ADDR,
-		.end	= CS5_BASE_ADDR + SZ_4K - 1,
-		.flags	= IORESOURCE_MEM,
-	},
-	{
-		.start	= IOMUX_TO_IRQ(MX51_PIN_GPIO1_9),
-		.end	= IOMUX_TO_IRQ(MX51_PIN_GPIO1_9),
-		.flags	= IORESOURCE_IRQ,
-	},
-};
-
-static struct platform_device smsc911x_device = {
-        .name             = "smsc911x",
-        .id               = -1,
-        .num_resources    = ARRAY_SIZE(smsc911x_device_resources),
-        .resource         = smsc911x_device_resources,
-};
-
-/* WEIM registers */
-#define CSGCR1	0x00
-#define CSGCR2	0x04
-#define CSRCR1	0x08
-#define CSRCR2	0x0C
-#define CSWCR1	0x10
-
-static void ccwmx51_init_ext_eth_mac(void)
-{
-	__iomem u32 *weim_vbaddr;
-
-	weim_vbaddr = ioremap(WEIM_BASE_ADDR, SZ_4K);
-	if (weim_vbaddr == 0) {
-		printk(KERN_ERR "Unable to ioremap 0x%08x in %s\n", WEIM_BASE_ADDR, __func__);
-		return;
-	}
-
-	/** Configure the CS timming, bus width, etc.
-	 * 16 bit on DATA[31..16], not multiplexed, async
-	 * RWSC=50, RADVA=2, RADVN=6, OEA=0, OEN=0, RCSA=0, RCSN=0, APR=0
-	 * WAL=0, WBED=1, WWSC=50, WADVA=2, WADVN=6, WEA=0, WEN=0, WCSA=0
-	 */
-	writel(0x00420081, (unsigned int)(weim_vbaddr) + 0x78 + CSGCR1);
-	writel(0, (unsigned int)(weim_vbaddr) + 0x78 + CSGCR2);
-	writel(0x32260000, (unsigned int)(weim_vbaddr) + 0x78 + CSRCR1);
-	writel(0, (unsigned int)(weim_vbaddr) + 0x78 + CSRCR2);
-	writel(0x72080f00, (unsigned int)(weim_vbaddr) + 0x78 + CSWCR1);
-
-	iounmap(weim_vbaddr);
-
-	/* Configure interrupt line as GPIO input, the iomux should be already setup */
-	gpio_request(IOMUX_TO_GPIO(MX51_PIN_GPIO1_9), "LAN2-irq");
-	gpio_direction_input(IOMUX_TO_GPIO(MX51_PIN_GPIO1_9));
-}
-#endif
-
-#if defined(CONFIG_FEC) || defined(CONFIG_FEC_MODULE)
-static struct resource mxc_fec_resources[] = {
-	{
-		.start	= FEC_BASE_ADDR,
-		.end	= FEC_BASE_ADDR + SZ_4K - 1,
-		.flags	= IORESOURCE_MEM
-	}, {
-		.start	= MXC_INT_FEC,
-		.end	= MXC_INT_FEC,
-		.flags	= IORESOURCE_IRQ
-	},
-};
-
-struct platform_device mxc_fec_device = {
-	.name = "fec",
-	.id = 0,
-	.num_resources = ARRAY_SIZE(mxc_fec_resources),
-	.resource = mxc_fec_resources,
-};
-#endif
-
-#if defined(CONFIG_FB_MXC_SYNC_PANEL) || \
-	defined(CONFIG_FB_MXC_SYNC_PANEL_MODULE)
-
-struct platform_device mxc_fb_devices[] = {
-	{
-		.name = "mxc_sdc_fb",
-		.id = 0,
-		.dev = {
-			.coherent_dma_mask = DMA_BIT_MASK(32),
-		},
-	 }, {
-		.name = "mxc_sdc_fb",
-		.id = 1,
-		.dev = {
-			.coherent_dma_mask = DMA_BIT_MASK(32),
-		},
-	}, {
-		.name = "mxc_sdc_fb",
-		.id = 2,
-		.dev = {
-			.coherent_dma_mask = DMA_BIT_MASK(32),
-		},
-	},
-};
-
-struct platform_device lcd_pdev = {
-	.name = "ccwmx51_display",
-	.dev = {
-		.coherent_dma_mask = DMA_BIT_MASK(32),
-	},
-};
-
-struct ccwmx51_lcd_pdata * ccwmx51_get_display(char *name)
-{
-#if defined(CONFIG_CCWMX51_LQ070Y3DG3B) || defined(CONFIG_CCWMX51_CUSTOM)
-	int i;
-
-	for (i = 0; i < ARRAY_SIZE(lcd_display_list); i++)
-		if (!strncmp(lcd_display_list[i].fb_pdata.mode->name,
-			     name, strlen(lcd_display_list[i].fb_pdata.mode->name)))
-			return &lcd_display_list[i];
-#endif
-	return NULL;
-}
-
-static int __init ccwmx51_init_fb(void)
-{
-	char *options = NULL, *p;
-
-	if (fb_get_options("displayfb", &options))
-		pr_warning("no display information available in command line\n");
-
-	if (!options)
-		return -ENODEV;
-
-	if (!strncasecmp(options, "VGA", 3)) {
-		pr_info("VGA interface is primary\n");
-
-		/* Get the desired configuration provided by the bootloader */
-		if (options[3] != '@') {
-			pr_info("Video resolution for VGA interface not provided, using default\n");
-			/* TODO set default video here */
-		} else {
-			options = &options[4];
-			if (((p = strsep (&options, "@")) != NULL) && *p) {
-				if (!strcmp(p, "640x480x16")) {
-					strcpy(mx51_fb_data[0].mode_str, "640x480M-16@60");
-				} else if (!strcmp(p, "800x600x16")) {
-					strcpy(mx51_fb_data[0].mode_str, "800x600M-16@60");
-				} else if (!strcmp(p, "1024x768x16")) {
-					strcpy(mx51_fb_data[0].mode_str, "1024x768M-16@60");
-				} else if (!strcmp(p, "1280x1024x16")) {
-					strcpy(mx51_fb_data[0].mode_str, "1280x1024M-16@60");
-				} else
-					pr_warning("Unsuported video resolution: %s, using default\n", p);
-			}
-		}
-	} else {
-		if ((plcd_platform_data = ccwmx51_get_display(options)) != NULL) {
-			memcpy(&mx51_fb_data[0], &plcd_platform_data->fb_pdata, sizeof(struct mxc_fb_platform_data));
-			plcd_platform_data->vif = 0;	/* Select video interface 0 */
-		}
-	}
-	return 0;
-}
-device_initcall(ccwmx51_init_fb);
-
-#endif
-
-struct platform_device mxc_dma_device = {
-     .name = "mxc_dma",
-     .id = 0,
-};
-
-void __init mx51_init_irq(void)
-{
-	unsigned long tzic_addr;
-
-	if (cpu_is_mx51_rev(CHIP_REV_2_0) < 0)
-		tzic_addr = TZIC_BASE_ADDR_T01;
-	else
-		tzic_addr = TZIC_BASE_ADDR;
-
-	mxc_tzic_init_irq(tzic_addr);
-}
-
-#define SCM_RD_DELAY	1000000 /* in nanoseconds */
-#define SEC_TO_NANOSEC  1000000000 /*Second to nanoseconds */
-static __init void mxc_init_scc_iram(void)
-{
-	uint32_t reg_value;
-	uint32_t reg_mask = 0;
-	uint8_t *UMID_base;
-	uint32_t *MAP_base;
-	uint8_t i;
-	uint32_t partition_no;
-	uint32_t scc_partno;
-	void *scm_ram_base;
-	void *scc_base;
-	uint8_t iram_partitions = 16;
-	struct timespec stime;
-	struct timespec curtime;
-	long scm_rd_timeout = 0;
-	long cur_ns = 0;
-	long start_ns = 0;
-
-	if (cpu_is_mx51_rev(CHIP_REV_2_0) < 0)
-		iram_partitions = 12;
-
-	scc_base = ioremap((uint32_t) SCC_BASE_ADDR, 0x140);
-	if (scc_base == NULL) {
-		printk(KERN_ERR "FAILED TO MAP IRAM REGS\n");
-		return;
-	}
-	scm_ram_base = ioremap((uint32_t) IRAM_BASE_ADDR, IRAM_SIZE);
-	if (scm_ram_base == NULL) {
-		printk(KERN_ERR "FAILED TO MAP IRAM\n");
-		return;
-	}
-
-	/* Wait for any running SCC operations to finish or fail */
-	getnstimeofday(&stime);
-	do {
-		reg_value = __raw_readl(scc_base + SCM_STATUS_REG);
-		getnstimeofday(&curtime);
-		if (curtime.tv_nsec > stime.tv_nsec)
-			scm_rd_timeout = curtime.tv_nsec - stime.tv_nsec;
-		else{
-			/*Converted second to nanosecond and add to
-			nsec when current nanosec is less than
-			start time nanosec.*/
-			cur_ns = (curtime.tv_sec * SEC_TO_NANOSEC) +
-			curtime.tv_nsec;
-			start_ns = (stime.tv_sec * SEC_TO_NANOSEC) +
-				stime.tv_nsec;
-			scm_rd_timeout = cur_ns - start_ns;
-		}
-	} while (((reg_value & SCM_STATUS_SRS_MASK) != SCM_STATUS_SRS_READY)
-	&& ((reg_value & SCM_STATUS_SRS_MASK) != SCM_STATUS_SRS_FAIL));
-
-	/* Check for failures */
-	if ((reg_value & SCM_STATUS_SRS_MASK) != SCM_STATUS_SRS_READY) {
-		/* Special message for bad secret key fuses */
-		if (reg_value & SCM_STATUS_KST_BAD_KEY)
-			printk(KERN_ERR "INVALID SCC KEY FUSE PATTERN\n");
-		else
-		    printk(KERN_ERR "SECURE RAM FAILURE\n");
-
-		iounmap(scm_ram_base);
-		iounmap(scc_base);
-		return;
-	}
-
-	scm_rd_timeout = 0;
-	/* Release final two partitions for SCC2 driver */
-	scc_partno = iram_partitions - (SCC_IRAM_SIZE / SZ_8K);
-	for (partition_no = scc_partno; partition_no < iram_partitions;
-	     partition_no++) {
-		reg_value = (((partition_no << SCM_ZCMD_PART_SHIFT) &
-			SCM_ZCMD_PART_MASK) | ((0x03 << SCM_ZCMD_CCMD_SHIFT) &
-			SCM_ZCMD_CCMD_MASK));
-		__raw_writel(reg_value, scc_base + SCM_ZCMD_REG);
-		udelay(1);
-		/* Wait for zeroization to complete */
-		getnstimeofday(&stime);
-		do {
-			reg_value = __raw_readl(scc_base + SCM_STATUS_REG);
-			getnstimeofday(&curtime);
-			if (curtime.tv_nsec > stime.tv_nsec)
-				scm_rd_timeout = curtime.tv_nsec -
-				stime.tv_nsec;
-			else {
-				/*Converted second to nanosecond and add to
-				nsec when current nanosec is less than
-				start time nanosec.*/
-				cur_ns = (curtime.tv_sec * SEC_TO_NANOSEC) +
-				curtime.tv_nsec;
-				start_ns = (stime.tv_sec * SEC_TO_NANOSEC) +
-					stime.tv_nsec;
-				scm_rd_timeout = cur_ns - start_ns;
-			}
-		} while (((reg_value & SCM_STATUS_SRS_MASK) !=
-		SCM_STATUS_SRS_READY) && ((reg_value & SCM_STATUS_SRS_MASK) !=
-		SCM_STATUS_SRS_FAIL) && (scm_rd_timeout <= SCM_RD_DELAY));
-
-		if (scm_rd_timeout > SCM_RD_DELAY)
-			printk(KERN_ERR "SCM Status Register Read timeout"
-			"for Partition No:%d", partition_no);
-
-		if ((reg_value & SCM_STATUS_SRS_MASK) != SCM_STATUS_SRS_READY)
-			break;
-	}
-
-	/*Check all expected partitions released */
-	reg_value = __raw_readl(scc_base + SCM_PART_OWNERS_REG);
-	if ((reg_value & reg_mask) != 0) {
-		printk(KERN_ERR "FAILED TO RELEASE IRAM PARTITION\n");
-		iounmap(scm_ram_base);
-		iounmap(scc_base);
-		return;
-	}
-	reg_mask = 0;
-	scm_rd_timeout = 0;
-	/* Allocate remaining partitions for general use */
-	for (partition_no = 0; partition_no < scc_partno; partition_no++) {
-		/* Supervisor mode claims a partition for it's own use
-		by writing zero to SMID register.*/
-		__raw_writel(0, scc_base + (SCM_SMID0_REG + 8 * partition_no));
-
-		/* Wait for any zeroization to complete */
-		getnstimeofday(&stime);
-		do {
-			reg_value = __raw_readl(scc_base + SCM_STATUS_REG);
-			getnstimeofday(&curtime);
-			if (curtime.tv_nsec > stime.tv_nsec)
-				scm_rd_timeout = curtime.tv_nsec -
-				stime.tv_nsec;
-			else{
-				/*Converted second to nanosecond and add to
-				nsec when current nanosec is less than
-				start time nanosec.*/
-				cur_ns = (curtime.tv_sec * SEC_TO_NANOSEC) +
-				curtime.tv_nsec;
-				start_ns = (stime.tv_sec * SEC_TO_NANOSEC) +
-					stime.tv_nsec;
-				scm_rd_timeout = cur_ns - start_ns;
-			}
-		} while (((reg_value & SCM_STATUS_SRS_MASK) !=
-		SCM_STATUS_SRS_READY) && ((reg_value & SCM_STATUS_SRS_MASK) !=
-		SCM_STATUS_SRS_FAIL) && (scm_rd_timeout <= SCM_RD_DELAY));
-
-		if (scm_rd_timeout > SCM_RD_DELAY)
-			printk(KERN_ERR "SCM Status Register Read timeout"
-			"for Partition No:%d", partition_no);
-
-		if ((reg_value & SCM_STATUS_SRS_MASK) != SCM_STATUS_SRS_READY)
-			break;
-		/* Set UMID=0 and permissions for universal data
-		read/write access */
-		MAP_base = scm_ram_base + (partition_no * 0x2000);
-		UMID_base = (uint8_t *) MAP_base + 0x10;
-		for (i = 0; i < 16; i++)
-			UMID_base[i] = 0;
-
-		MAP_base[0] = (SCM_PERM_NO_ZEROIZE | SCM_PERM_HD_SUP_DISABLE |
-			SCM_PERM_HD_READ | SCM_PERM_HD_WRITE |
-			SCM_PERM_HD_EXECUTE | SCM_PERM_TH_READ |
-			SCM_PERM_TH_WRITE);
-		reg_mask |= (3 << (2 * (partition_no)));
-	}
-
-	/* Check all expected partitions allocated */
-	reg_value = __raw_readl(scc_base + SCM_PART_OWNERS_REG);
-	if ((reg_value & reg_mask) != reg_mask) {
-		printk(KERN_ERR "FAILED TO ACQUIRE IRAM PARTITION\n");
-		iounmap(scm_ram_base);
-		iounmap(scc_base);
-		return;
-	}
-
-	iounmap(scm_ram_base);
-	iounmap(scc_base);
-	printk(KERN_INFO "IRAM READY\n");
-	iram_ready = 1;
-}
-
-int __init mxc_init_devices(void)
-{
-	unsigned long addr;
-
-	iram_alloc(VPU_IRAM_SIZE, &addr);
-	vpu_resources[0].start = addr;
-	vpu_resources[0].end = addr + VPU_IRAM_SIZE - 1;
-
-	mxc_init_scc_iram();
-#if defined(CONFIG_UIO_PDRV_GENIRQ) || defined(CONFIG_UIO_PDRV_GENIRQ_MODULE)
-	mxc_init_gpu2d();
-#endif
-#if defined(CONFIG_SMSC9118) || defined(CONFIG_SMSC9118_MODULE)
-	ccwmx51_init_ext_eth_mac();
-#endif
-	return 0;
-}
-postcore_initcall(mxc_init_devices);
-
diff --git a/arch/arm/mach-mx51/devices.h b/arch/arm/mach-mx51/devices.h
deleted file mode 100644
index b9b1138580a7..000000000000
--- a/arch/arm/mach-mx51/devices.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-extern struct platform_device mxc_w1_master_device;
-extern struct platform_device mxc_keypad_device;
-extern struct platform_device mxc_rtc_device;
-extern struct platform_device mxc_nandv2_mtd_device;
-extern struct platform_device imx_nfc_device;
-extern struct platform_device mxc_wdt_device;
-extern struct platform_device mxc_pwm1_device;
-extern struct platform_device mxc_pwm2_device;
-extern struct platform_device mxc_pwm_backlight_device;
-extern struct platform_device mxc_ipu_device;
-extern struct platform_device mxc_fb_devices[];
-extern struct platform_device mxcvpu_device;
-extern struct platform_device mxcspi1_device;
-extern struct platform_device mxcspi2_device;
-extern struct platform_device mxcspi3_device;
-extern struct platform_device mxci2c_devices[];
-extern struct platform_device mxci2c_hs_device;
-extern struct platform_device mxc_tve_device;
-extern struct platform_device mxc_dvfs_core_device;
-extern struct platform_device mxc_dvfs_per_device;
-extern struct platform_device mxc_ssi1_device;
-extern struct platform_device mxc_ssi2_device;
-extern struct platform_device mxc_alsa_spdif_device;
-extern struct platform_device mx51_lpmode_device;
-extern struct platform_device busfreq_device;
-extern struct platform_device sdram_autogating_device;
-extern struct platform_device mxc_iim_device;
-extern struct platform_device mxc_sim_device;
-extern struct platform_device mxcsdhc1_device;
-extern struct platform_device mxcsdhc3_device;
-extern struct platform_device lcd_pdev;
-extern struct platform_device pata_fsl_device;
-extern struct platform_device mxc_gpu2d_device;
-extern struct platform_device mxc_wm8753_device;
-extern struct platform_device gpu_device;
-extern struct platform_device mxc_fec_device;
-extern struct platform_device mxc_usbdr_udc_device;
-extern struct platform_device mxc_usbdr_otg_device;
-extern struct platform_device mxc_usbdr_host_device;
-extern struct platform_device mxc_usbh1_device;
-extern struct platform_device mxc_usbh2_device;
-extern struct platform_device mxc_dma_device;
-extern struct mxc_fb_platform_data mx51_fb_data[];
-extern struct ccwmx51_lcd_pdata * plcd_platform_data;
diff --git a/arch/arm/mach-mx51/dummy_gpio.c b/arch/arm/mach-mx51/dummy_gpio.c
deleted file mode 100644
index 8eb771d29a06..000000000000
--- a/arch/arm/mach-mx51/dummy_gpio.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2007-2009 Freescale Semiconductor, Inc. All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-#include <linux/errno.h>
-#include <linux/module.h>
-
-void gpio_gps_active(void) {}
-EXPORT_SYMBOL(gpio_gps_active);
-
-void gpio_gps_inactive(void) {}
-EXPORT_SYMBOL(gpio_gps_inactive);
-
-void config_uartdma_event(int port) {}
-EXPORT_SYMBOL(config_uartdma_event);
-
-void gpio_spi_active(int cspi_mod) {}
-EXPORT_SYMBOL(gpio_spi_active);
-
-void gpio_spi_inactive(int cspi_mod) {}
-EXPORT_SYMBOL(gpio_spi_inactive);
-
-void gpio_owire_active(void) {}
-EXPORT_SYMBOL(gpio_owire_active);
-
-void gpio_owire_inactive(void) {}
-EXPORT_SYMBOL(gpio_owire_inactive);
-
-void gpio_i2c_active(int i2c_num) {}
-EXPORT_SYMBOL(gpio_i2c_active);
-
-void gpio_i2c_inactive(int i2c_num) {}
-EXPORT_SYMBOL(gpio_i2c_inactive);
-
-void gpio_i2c_hs_active(void) {}
-EXPORT_SYMBOL(gpio_i2c_hs_active);
-
-void gpio_i2c_hs_inactive(void) {}
-EXPORT_SYMBOL(gpio_i2c_hs_inactive);
-
-void gpio_pmic_active(void) {}
-EXPORT_SYMBOL(gpio_pmic_active);
-
-void gpio_activate_audio_ports(void) {}
-EXPORT_SYMBOL(gpio_activate_audio_ports);
-
-void gpio_sdhc_active(int module) {}
-EXPORT_SYMBOL(gpio_sdhc_active);
-
-void gpio_sdhc_inactive(int module) {}
-EXPORT_SYMBOL(gpio_sdhc_inactive);
-
-void gpio_sensor_select(int sensor) {}
-
-void gpio_sensor_active(unsigned int csi) {}
-EXPORT_SYMBOL(gpio_sensor_active);
-
-void gpio_sensor_inactive(unsigned int csi) {}
-EXPORT_SYMBOL(gpio_sensor_inactive);
-
-void gpio_ata_active(void) {}
-EXPORT_SYMBOL(gpio_ata_active);
-
-void gpio_ata_inactive(void) {}
-EXPORT_SYMBOL(gpio_ata_inactive);
-
-void gpio_nand_active(void) {}
-EXPORT_SYMBOL(gpio_nand_active);
-
-void gpio_nand_inactive(void) {}
-EXPORT_SYMBOL(gpio_nand_inactive);
-
-void gpio_keypad_active(void) {}
-EXPORT_SYMBOL(gpio_keypad_active);
-
-void gpio_keypad_inactive(void) {}
-EXPORT_SYMBOL(gpio_keypad_inactive);
-
-int gpio_usbotg_hs_active(void)
-{
-	return 0;
-}
-EXPORT_SYMBOL(gpio_usbotg_hs_active);
-
-void gpio_usbotg_hs_inactive(void) {}
-EXPORT_SYMBOL(gpio_usbotg_hs_inactive);
-
-void gpio_fec_active(void) {}
-EXPORT_SYMBOL(gpio_fec_active);
-
-void gpio_fec_inactive(void) {}
-EXPORT_SYMBOL(gpio_fec_inactive);
-
-void gpio_spdif_active(void) {}
-EXPORT_SYMBOL(gpio_spdif_active);
-
-void gpio_spdif_inactive(void) {}
-EXPORT_SYMBOL(gpio_spdif_inactive);
diff --git a/arch/arm/mach-mx51/mx51_pins.h b/arch/arm/mach-mx51/mx51_pins.h
deleted file mode 100644
index 0072da975894..000000000000
--- a/arch/arm/mach-mx51/mx51_pins.h
+++ /dev/null
@@ -1,361 +0,0 @@
-/*
- * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#ifndef __ASM_ARCH_MXC_MX51_PINS_H__
-#define __ASM_ARCH_MXC_MX51_PINS_H__
-
-/*!
- * @file arch-mxc/mx51_pins.h
- *
- * @brief MX51 I/O Pin List
- *
- * @ingroup GPIO_MX51
- */
-
-#ifndef __ASSEMBLY__
-
-/*!
- * @name IOMUX/PAD Bit field definitions
- */
-
-/*! @{ */
-
-/*!
- * In order to identify pins more effectively, each mux-controlled pin's
- * enumerated value is constructed in the following way:
- *
- * -------------------------------------------------------------------
- * 31-29 | 28 - 24 |  23 - 21 | 20  - 10| 9 - 0
- * -------------------------------------------------------------------
- * IO_P  |  IO_I  | GPIO_I | PAD_I  | MUX_I
- * -------------------------------------------------------------------
- *
- * Bit 0 to 9 contains MUX_I used to identify the register
- * offset (0-based. base is IOMUX_module_base) defined in the Section
- * "sw_pad_ctl & sw_mux_ctl details" of the IC Spec. The
- * similar field definitions are used for the pad control register.
- * For example, the MX51_PIN_ETM_D0 is defined in the enumeration:
- *    ( (0x28 - MUX_I_START) << MUX_I)|( (0x250 - PAD_I_START) << PAD_I)
- * It means the mux control register is at register offset 0x28. The pad control
- * register offset is: 0x250 and also occupy the least significant bits
- * within the register.
- */
-
-/*!
- * Starting bit position within each entry of \b iomux_pins to represent the
- * MUX control register offset
- */
-#define MUX_I			0
-/*!
- * Starting bit position within each entry of \b iomux_pins to represent the
- * PAD control register offset
- */
-#define PAD_I			10
-/*!
- * Starting bit position within each entry of \b iomux_pins to represent which
- * mux mode is for GPIO (0-based)
- */
-#define GPIO_I			21
-
-#define NON_GPIO_PORT		0x7
-#define PIN_TO_MUX_MASK		((1 << (PAD_I - MUX_I)) - 1)
-#define PIN_TO_PAD_MASK		((1 << (GPIO_I - PAD_I)) - 1)
-#define PIN_TO_ALT_GPIO_MASK		((1 << (MUX_IO_I - GPIO_I)) - 1)
-
-#define NON_MUX_I		PIN_TO_MUX_MASK
-#define MUX_I_START		0x001C
-#define PAD_I_START		0x3F0
-#define INPUT_CTL_START		0x8C4
-#define INPUT_CTL_START_TO1	0x928
-#define MUX_I_END		(PAD_I_START - 4)
-
-#define _MXC_BUILD_PIN(gp, gi, ga, mi, pi) \
-	(((gp) << MUX_IO_P) | ((gi) << MUX_IO_I) | \
-	((mi) << MUX_I) | \
-	((pi - PAD_I_START) << PAD_I) | \
-	((ga) << GPIO_I))
-
-#define _MXC_BUILD_GPIO_PIN(gp, gi, ga, mi, pi) \
-    _MXC_BUILD_PIN(gp, gi, ga, mi, pi)
-
-#define _MXC_BUILD_NON_GPIO_PIN(mi, pi) \
-    _MXC_BUILD_PIN(NON_GPIO_PORT, 0, 0, mi, pi)
-
-#define PIN_TO_IOMUX_MUX(pin)	((pin >> MUX_I) & PIN_TO_MUX_MASK)
-#define PIN_TO_IOMUX_PAD(pin)	((pin >> PAD_I) & PIN_TO_PAD_MASK)
-#define PIN_TO_ALT_GPIO(pin)	((pin >> GPIO_I) & PIN_TO_ALT_GPIO_MASK)
-#define PIN_TO_IOMUX_INDEX(pin)	(PIN_TO_IOMUX_MUX(pin) >> 2)
-
-/*! @} End IOMUX/PAD Bit field definitions */
-
-/*!
- * This enumeration is constructed based on the Section
- * "sw_pad_ctl & sw_mux_ctl details" of the MX51 IC Spec. Each enumerated
- * value is constructed based on the rules described above.
- */
-enum iomux_pins {
-	MX51_PIN_EIM_DA0 = _MXC_BUILD_NON_GPIO_PIN(0x1C, 0x7A8),
-	MX51_PIN_EIM_DA1 = _MXC_BUILD_NON_GPIO_PIN(0x20, 0x7A8),
-	MX51_PIN_EIM_DA2 = _MXC_BUILD_NON_GPIO_PIN(0x24, 0x7A8),
-	MX51_PIN_EIM_DA3 = _MXC_BUILD_NON_GPIO_PIN(0x28, 0x7A8),
-	MX51_PIN_EIM_DA4 = _MXC_BUILD_NON_GPIO_PIN(0x2C, 0x7AC),
-	MX51_PIN_EIM_DA5 = _MXC_BUILD_NON_GPIO_PIN(0x30, 0x7AC),
-	MX51_PIN_EIM_DA6 = _MXC_BUILD_NON_GPIO_PIN(0x34, 0x7AC),
-	MX51_PIN_EIM_DA7 = _MXC_BUILD_NON_GPIO_PIN(0x38, 0x7AC),
-	MX51_PIN_EIM_DA8 = _MXC_BUILD_NON_GPIO_PIN(0x3C, 0x7B0),
-	MX51_PIN_EIM_DA9 = _MXC_BUILD_NON_GPIO_PIN(0x40, 0x7B0),
-	MX51_PIN_EIM_DA10 = _MXC_BUILD_NON_GPIO_PIN(0x44, 0x7B0),
-	MX51_PIN_EIM_DA11 = _MXC_BUILD_NON_GPIO_PIN(0x48, 0x7B0),
-	MX51_PIN_EIM_DA12 = _MXC_BUILD_NON_GPIO_PIN(0x4C, 0x7BC),
-	MX51_PIN_EIM_DA13 = _MXC_BUILD_NON_GPIO_PIN(0x50, 0x7BC),
-	MX51_PIN_EIM_DA14 = _MXC_BUILD_NON_GPIO_PIN(0x54, 0x7BC),
-	MX51_PIN_EIM_DA15 = _MXC_BUILD_NON_GPIO_PIN(0x58, 0x7BC),
-	MX51_PIN_EIM_D16 = _MXC_BUILD_GPIO_PIN(1, 0, 1, 0x5C, 0x3F0),
-	MX51_PIN_EIM_D17 = _MXC_BUILD_GPIO_PIN(1, 1, 1, 0x60, 0x3F4),
-	MX51_PIN_EIM_D18 = _MXC_BUILD_GPIO_PIN(1, 2, 1, 0x64, 0x3F8),
-	MX51_PIN_EIM_D19 = _MXC_BUILD_GPIO_PIN(1, 3, 1, 0x68, 0x3FC),
-	MX51_PIN_EIM_D20 = _MXC_BUILD_GPIO_PIN(1, 4, 1, 0x6C, 0x400),
-	MX51_PIN_EIM_D21 = _MXC_BUILD_GPIO_PIN(1, 5, 1, 0x70, 0x404),
-	MX51_PIN_EIM_D22 = _MXC_BUILD_GPIO_PIN(1, 6, 1, 0x74, 0x408),
-	MX51_PIN_EIM_D23 = _MXC_BUILD_GPIO_PIN(1, 7, 1, 0x78, 0x40C),
-	MX51_PIN_EIM_D24 = _MXC_BUILD_GPIO_PIN(1, 8, 1, 0x7C, 0x410),
-	MX51_PIN_EIM_D25 = _MXC_BUILD_NON_GPIO_PIN(0x80, 0x414),
-	MX51_PIN_EIM_D26 = _MXC_BUILD_NON_GPIO_PIN(0x84, 0x418),
-	MX51_PIN_EIM_D27 = _MXC_BUILD_GPIO_PIN(1, 9, 1, 0x88, 0x41C),
-	MX51_PIN_EIM_D28 = _MXC_BUILD_NON_GPIO_PIN(0x8C, 0x420),
-	MX51_PIN_EIM_D29 = _MXC_BUILD_NON_GPIO_PIN(0x90, 0x424),
-	MX51_PIN_EIM_D30 = _MXC_BUILD_NON_GPIO_PIN(0x94, 0x428),
-	MX51_PIN_EIM_D31 = _MXC_BUILD_NON_GPIO_PIN(0x98, 0x42C),
-	MX51_PIN_EIM_A16 = _MXC_BUILD_GPIO_PIN(1, 10, 1, 0x9C, 0x430),
-	MX51_PIN_EIM_A17 = _MXC_BUILD_GPIO_PIN(1, 11, 1, 0xA0, 0x434),
-	MX51_PIN_EIM_A18 = _MXC_BUILD_GPIO_PIN(1, 12, 1, 0xA4, 0x438),
-	MX51_PIN_EIM_A19 = _MXC_BUILD_GPIO_PIN(1, 13, 1, 0xA8, 0x43C),
-	MX51_PIN_EIM_A20 = _MXC_BUILD_GPIO_PIN(1, 14, 1, 0xAC, 0x440),
-	MX51_PIN_EIM_A21 = _MXC_BUILD_GPIO_PIN(1, 15, 1, 0xB0, 0x444),
-	MX51_PIN_EIM_A22 = _MXC_BUILD_GPIO_PIN(1, 16, 1, 0xB4, 0x448),
-	MX51_PIN_EIM_A23 = _MXC_BUILD_GPIO_PIN(1, 17, 1, 0xB8, 0x44C),
-	MX51_PIN_EIM_A24 = _MXC_BUILD_GPIO_PIN(1, 18, 1, 0xBC, 0x450),
-	MX51_PIN_EIM_A25 = _MXC_BUILD_GPIO_PIN(1, 19, 1, 0xC0, 0x454),
-	MX51_PIN_EIM_A26 = _MXC_BUILD_GPIO_PIN(1, 20, 1, 0xC4, 0x458),
-	MX51_PIN_EIM_A27 = _MXC_BUILD_GPIO_PIN(1, 21, 1, 0xC8, 0x45C),
-	MX51_PIN_EIM_EB0 = _MXC_BUILD_NON_GPIO_PIN(0xCC, 0x460),
-	MX51_PIN_EIM_EB1 = _MXC_BUILD_NON_GPIO_PIN(0xD0, 0x464),
-	MX51_PIN_EIM_EB2 = _MXC_BUILD_GPIO_PIN(1, 22, 1, 0xD4, 0x468),
-	MX51_PIN_EIM_EB3 = _MXC_BUILD_GPIO_PIN(1, 23, 1, 0xD8, 0x46C),
-	MX51_PIN_EIM_OE = _MXC_BUILD_GPIO_PIN(1, 24, 1, 0xDC, 0x470),
-	MX51_PIN_EIM_CS0 = _MXC_BUILD_GPIO_PIN(1, 25, 1, 0xE0, 0x474),
-	MX51_PIN_EIM_CS1 = _MXC_BUILD_GPIO_PIN(1, 26, 1, 0xE4, 0x478),
-	MX51_PIN_EIM_CS2 = _MXC_BUILD_GPIO_PIN(1, 27, 1, 0xE8, 0x47C),
-	MX51_PIN_EIM_CS3 = _MXC_BUILD_GPIO_PIN(1, 28, 1, 0xEC, 0x480),
-	MX51_PIN_EIM_CS4 = _MXC_BUILD_GPIO_PIN(1, 29, 1, 0xF0, 0x484),
-	MX51_PIN_EIM_CS5 = _MXC_BUILD_GPIO_PIN(1, 30, 1, 0xF4, 0x488),
-	MX51_PIN_EIM_DTACK = _MXC_BUILD_GPIO_PIN(1, 31, 1, 0xF8, 0x48C),
-	MX51_PIN_EIM_LBA = _MXC_BUILD_GPIO_PIN(2, 1, 1, 0xFC, 0x494),
-	MX51_PIN_EIM_CRE = _MXC_BUILD_GPIO_PIN(2, 2, 1, 0x100, 0x4A0),
-	MX51_PIN_DRAM_CS1 = _MXC_BUILD_NON_GPIO_PIN(0x104, 0x4D0),
-	MX51_PIN_NANDF_WE_B = _MXC_BUILD_GPIO_PIN(2, 3, 3, 0x108, 0x4E4),
-	MX51_PIN_NANDF_RE_B = _MXC_BUILD_GPIO_PIN(2, 4, 3, 0x10C, 0x4E8),
-	MX51_PIN_NANDF_ALE = _MXC_BUILD_GPIO_PIN(2, 5, 3, 0x110, 0x4EC),
-	MX51_PIN_NANDF_CLE = _MXC_BUILD_GPIO_PIN(2, 6, 3, 0x114, 0x4F0),
-	MX51_PIN_NANDF_WP_B = _MXC_BUILD_GPIO_PIN(2, 7, 3, 0x118, 0x4F4),
-	MX51_PIN_NANDF_RB0 = _MXC_BUILD_GPIO_PIN(2, 8, 3, 0x11C, 0x4F8),
-	MX51_PIN_NANDF_RB1 = _MXC_BUILD_GPIO_PIN(2, 9, 3, 0x120, 0x4FC),
-	MX51_PIN_NANDF_RB2 = _MXC_BUILD_GPIO_PIN(2, 10, 3, 0x124, 0x500),
-	MX51_PIN_NANDF_RB3 = _MXC_BUILD_GPIO_PIN(2, 11, 3, 0x128, 0x504),
-	MX51_PIN_GPIO_NAND = _MXC_BUILD_GPIO_PIN(2, 12, 0, 0x12C, 0x514),
-	MX51_PIN_NANDF_RB4 = MX51_PIN_GPIO_NAND,
-	MX51_PIN_NANDF_RB5 = _MXC_BUILD_GPIO_PIN(2, 13, 3, 0x130, 0x5D8),
-	MX51_PIN_NANDF_RB6 = _MXC_BUILD_GPIO_PIN(2, 14, 3, 0x134, 0x5DC),
-	MX51_PIN_NANDF_RB7 = _MXC_BUILD_GPIO_PIN(2, 15, 3, 0x138, 0x5E0),
-	MX51_PIN_NANDF_CS0 = _MXC_BUILD_GPIO_PIN(2, 16, 3, 0x130, 0x518),
-	MX51_PIN_NANDF_CS1 = _MXC_BUILD_GPIO_PIN(2, 17, 3, 0x134, 0x51C),
-	MX51_PIN_NANDF_CS2 = _MXC_BUILD_GPIO_PIN(2, 18, 3, 0x138, 0x520),
-	MX51_PIN_NANDF_CS3 = _MXC_BUILD_GPIO_PIN(2, 19, 3, 0x13C, 0x524),
-	MX51_PIN_NANDF_CS4 = _MXC_BUILD_GPIO_PIN(2, 20, 3, 0x140, 0x528),
-	MX51_PIN_NANDF_CS5 = _MXC_BUILD_GPIO_PIN(2, 21, 3, 0x144, 0x52C),
-	MX51_PIN_NANDF_CS6 = _MXC_BUILD_GPIO_PIN(2, 22, 3, 0x148, 0x530),
-	MX51_PIN_NANDF_CS7 = _MXC_BUILD_GPIO_PIN(2, 23, 3, 0x14C, 0x534),
-	MX51_PIN_NANDF_RDY_INT = _MXC_BUILD_GPIO_PIN(2, 24, 3, 0x150, 0x538),
-	MX51_PIN_NANDF_D15 = _MXC_BUILD_GPIO_PIN(2, 25, 3, 0x154, 0x53C),
-	MX51_PIN_NANDF_D14 = _MXC_BUILD_GPIO_PIN(2, 26, 3, 0x158, 0x540),
-	MX51_PIN_NANDF_D13 = _MXC_BUILD_GPIO_PIN(2, 27, 3, 0x15C, 0x544),
-	MX51_PIN_NANDF_D12 = _MXC_BUILD_GPIO_PIN(2, 28, 3, 0x160, 0x548),
-	MX51_PIN_NANDF_D11 = _MXC_BUILD_GPIO_PIN(2, 29, 3, 0x164, 0x54C),
-	MX51_PIN_NANDF_D10 = _MXC_BUILD_GPIO_PIN(2, 30, 3, 0x168, 0x550),
-	MX51_PIN_NANDF_D9 = _MXC_BUILD_GPIO_PIN(2, 31, 3, 0x16C, 0x554),
-	MX51_PIN_NANDF_D8 = _MXC_BUILD_GPIO_PIN(3, 0, 3, 0x170, 0x558),
-	MX51_PIN_NANDF_D7 = _MXC_BUILD_GPIO_PIN(3, 1, 3, 0x174, 0x55C),
-	MX51_PIN_NANDF_D6 = _MXC_BUILD_GPIO_PIN(3, 2, 3, 0x178, 0x560),
-	MX51_PIN_NANDF_D5 = _MXC_BUILD_GPIO_PIN(3, 3, 3, 0x17C, 0x564),
-	MX51_PIN_NANDF_D4 = _MXC_BUILD_GPIO_PIN(3, 4, 3, 0x180, 0x568),
-	MX51_PIN_NANDF_D3 = _MXC_BUILD_GPIO_PIN(3, 5, 3, 0x184, 0x56C),
-	MX51_PIN_NANDF_D2 = _MXC_BUILD_GPIO_PIN(3, 6, 3, 0x188, 0x570),
-	MX51_PIN_NANDF_D1 = _MXC_BUILD_GPIO_PIN(3, 7, 3, 0x18C, 0x574),
-	MX51_PIN_NANDF_D0 = _MXC_BUILD_GPIO_PIN(3, 8, 3, 0x190, 0x578),
-	MX51_PIN_CSI1_D8 = _MXC_BUILD_GPIO_PIN(2, 12, 3, 0x194, 0x57C),
-	MX51_PIN_CSI1_D9 = _MXC_BUILD_GPIO_PIN(2, 13, 3, 0x198, 0x580),
-	MX51_PIN_CSI1_D10 = _MXC_BUILD_NON_GPIO_PIN(0x19C, 0x584),
-	MX51_PIN_CSI1_D11 = _MXC_BUILD_NON_GPIO_PIN(0x1A0, 0x588),
-	MX51_PIN_CSI1_D12 = _MXC_BUILD_NON_GPIO_PIN(0x1A4, 0x58C),
-	MX51_PIN_CSI1_D13 = _MXC_BUILD_NON_GPIO_PIN(0x1A8, 0x590),
-	MX51_PIN_CSI1_D14 = _MXC_BUILD_NON_GPIO_PIN(0x1AC, 0x594),
-	MX51_PIN_CSI1_D15 = _MXC_BUILD_NON_GPIO_PIN(0x1B0, 0x598),
-	MX51_PIN_CSI1_D16 = _MXC_BUILD_NON_GPIO_PIN(0x1B4, 0x59C),
-	MX51_PIN_CSI1_D17 = _MXC_BUILD_NON_GPIO_PIN(0x1B8, 0x5A0),
-	MX51_PIN_CSI1_D18 = _MXC_BUILD_NON_GPIO_PIN(0x1BC, 0x5A4),
-	MX51_PIN_CSI1_D19 = _MXC_BUILD_NON_GPIO_PIN(0x1C0, 0x5A8),
-	MX51_PIN_CSI1_VSYNC = _MXC_BUILD_GPIO_PIN(2, 14, 3, 0x1C4, 0x5AC),
-	MX51_PIN_CSI1_HSYNC = _MXC_BUILD_GPIO_PIN(2, 15, 3, 0x1C8, 0x5B0),
-	MX51_PIN_CSI1_PIXCLK = _MXC_BUILD_NON_GPIO_PIN(NON_MUX_I, 0x5B4),
-	MX51_PIN_CSI1_MCLK = _MXC_BUILD_NON_GPIO_PIN(NON_MUX_I, 0x5B8),
-	MX51_PIN_CSI1_PKE0 = _MXC_BUILD_NON_GPIO_PIN(NON_MUX_I, 0x860),
-	MX51_PIN_CSI2_D12 = _MXC_BUILD_GPIO_PIN(3, 9, 3, 0x1CC, 0x5BC),
-	MX51_PIN_CSI2_D13 = _MXC_BUILD_GPIO_PIN(3, 10, 3, 0x1D0, 0x5C0),
-	MX51_PIN_CSI2_D14 = _MXC_BUILD_NON_GPIO_PIN(0x1D4, 0x5C4),
-	MX51_PIN_CSI2_D15 = _MXC_BUILD_NON_GPIO_PIN(0x1D8, 0x5C8),
-	MX51_PIN_CSI2_D16 = _MXC_BUILD_NON_GPIO_PIN(0x1DC, 0x5CC),
-	MX51_PIN_CSI2_D17 = _MXC_BUILD_NON_GPIO_PIN(0x1E0, 0x5D0),
-	MX51_PIN_CSI2_D18 = _MXC_BUILD_GPIO_PIN(3, 11, 3, 0x1E4, 0x5D4),
-	MX51_PIN_CSI2_D19 = _MXC_BUILD_GPIO_PIN(3, 12, 3, 0x1E8, 0x5D8),
-	MX51_PIN_CSI2_VSYNC = _MXC_BUILD_GPIO_PIN(3, 13, 3, 0x1EC, 0x5DC),
-	MX51_PIN_CSI2_HSYNC = _MXC_BUILD_GPIO_PIN(3, 14, 3, 0x1F0, 0x5E0),
-	MX51_PIN_CSI2_PIXCLK = _MXC_BUILD_GPIO_PIN(3, 15, 3, 0x1F4, 0x5E4),
-	MX51_PIN_CSI2_PKE0 = _MXC_BUILD_NON_GPIO_PIN(NON_MUX_I, 0x81C),
-	MX51_PIN_I2C1_CLK = _MXC_BUILD_GPIO_PIN(3, 16, 3, 0x1F8, 0x5E8),
-	MX51_PIN_I2C1_DAT = _MXC_BUILD_GPIO_PIN(3, 17, 3, 0x1FC, 0x5EC),
-	MX51_PIN_AUD3_BB_TXD = _MXC_BUILD_GPIO_PIN(3, 18, 3, 0x200, 0x5F0),
-	MX51_PIN_AUD3_BB_RXD = _MXC_BUILD_GPIO_PIN(3, 19, 3, 0x204, 0x5F4),
-	MX51_PIN_AUD3_BB_CK = _MXC_BUILD_GPIO_PIN(3, 20, 3, 0x208, 0x5F8),
-	MX51_PIN_AUD3_BB_FS = _MXC_BUILD_GPIO_PIN(3, 21, 3, 0x20C, 0x5FC),
-	MX51_PIN_CSPI1_MOSI = _MXC_BUILD_GPIO_PIN(3, 22, 3, 0x210, 0x600),
-	MX51_PIN_CSPI1_MISO = _MXC_BUILD_GPIO_PIN(3, 23, 3, 0x214, 0x604),
-	MX51_PIN_CSPI1_SS0 = _MXC_BUILD_GPIO_PIN(3, 24, 3, 0x218, 0x608),
-	MX51_PIN_CSPI1_SS1 = _MXC_BUILD_GPIO_PIN(3, 25, 3, 0x21C, 0x60C),
-	MX51_PIN_CSPI1_RDY = _MXC_BUILD_GPIO_PIN(3, 26, 3, 0x220, 0x610),
-	MX51_PIN_CSPI1_SCLK = _MXC_BUILD_GPIO_PIN(3, 27, 3, 0x224, 0x614),
-	MX51_PIN_UART1_RXD = _MXC_BUILD_GPIO_PIN(3, 28, 3, 0x228, 0x618),
-	MX51_PIN_UART1_TXD = _MXC_BUILD_GPIO_PIN(3, 29, 3, 0x22C, 0x61C),
-	MX51_PIN_UART1_RTS = _MXC_BUILD_GPIO_PIN(3, 30, 3, 0x230, 0x620),
-	MX51_PIN_UART1_CTS = _MXC_BUILD_GPIO_PIN(3, 31, 3, 0x234, 0x624),
-	MX51_PIN_UART2_RXD = _MXC_BUILD_GPIO_PIN(0, 20, 3, 0x238, 0x628),
-	MX51_PIN_UART2_TXD = _MXC_BUILD_GPIO_PIN(0, 21, 3, 0x23C, 0x62C),
-	MX51_PIN_UART3_RXD = _MXC_BUILD_GPIO_PIN(0, 22, 3, 0x240, 0x630),
-	MX51_PIN_UART3_TXD = _MXC_BUILD_GPIO_PIN(0, 23, 3, 0x244, 0x634),
-	MX51_PIN_OWIRE_LINE = _MXC_BUILD_GPIO_PIN(0, 24, 3, 0x248, 0x638),
-	MX51_PIN_KEY_ROW0 = _MXC_BUILD_NON_GPIO_PIN(0x24C, 0x63C),
-	MX51_PIN_KEY_ROW1 = _MXC_BUILD_NON_GPIO_PIN(0x250, 0x640),
-	MX51_PIN_KEY_ROW2 = _MXC_BUILD_NON_GPIO_PIN(0x254, 0x644),
-	MX51_PIN_KEY_ROW3 = _MXC_BUILD_NON_GPIO_PIN(0x258, 0x648),
-	MX51_PIN_KEY_COL0 = _MXC_BUILD_NON_GPIO_PIN(0x25C, 0x64C),
-	MX51_PIN_KEY_COL1 = _MXC_BUILD_NON_GPIO_PIN(0x260, 0x650),
-	MX51_PIN_KEY_COL2 = _MXC_BUILD_NON_GPIO_PIN(0x264, 0x654),
-	MX51_PIN_KEY_COL3 = _MXC_BUILD_NON_GPIO_PIN(0x268, 0x658),
-	MX51_PIN_KEY_COL4 = _MXC_BUILD_NON_GPIO_PIN(0x26C, 0x65C),
-	MX51_PIN_KEY_COL5 = _MXC_BUILD_NON_GPIO_PIN(0x270, 0x660),
-	MX51_PIN_USBH1_CLK = _MXC_BUILD_GPIO_PIN(0, 25, 2, 0x278, 0x678),
-	MX51_PIN_USBH1_DIR = _MXC_BUILD_GPIO_PIN(0, 26, 2, 0x27C, 0x67C),
-	MX51_PIN_USBH1_STP = _MXC_BUILD_GPIO_PIN(0, 27, 2, 0x280, 0x680),
-	MX51_PIN_USBH1_NXT = _MXC_BUILD_GPIO_PIN(0, 28, 2, 0x284, 0x684),
-	MX51_PIN_USBH1_DATA0 = _MXC_BUILD_GPIO_PIN(0, 11, 2, 0x288, 0x688),
-	MX51_PIN_USBH1_DATA1 = _MXC_BUILD_GPIO_PIN(0, 12, 2, 0x28C, 0x68C),
-	MX51_PIN_USBH1_DATA2 = _MXC_BUILD_GPIO_PIN(0, 13, 2, 0x290, 0x690),
-	MX51_PIN_USBH1_DATA3 = _MXC_BUILD_GPIO_PIN(0, 14, 2, 0x294, 0x694),
-	MX51_PIN_USBH1_DATA4 = _MXC_BUILD_GPIO_PIN(0, 15, 2, 0x298, 0x698),
-	MX51_PIN_USBH1_DATA5 = _MXC_BUILD_GPIO_PIN(0, 16, 2, 0x29C, 0x69C),
-	MX51_PIN_USBH1_DATA6 = _MXC_BUILD_GPIO_PIN(0, 17, 2, 0x2A0, 0x6A0),
-	MX51_PIN_USBH1_DATA7 = _MXC_BUILD_GPIO_PIN(0, 18, 2, 0x2A4, 0x6A4),
-	MX51_PIN_DI1_PIN11 = _MXC_BUILD_GPIO_PIN(2, 0, 4, 0x2A8, 0x6A8),
-	MX51_PIN_DI1_PIN12 = _MXC_BUILD_GPIO_PIN(2, 1, 4, 0x2AC, 0x6AC),
-	MX51_PIN_DI1_PIN13 = _MXC_BUILD_GPIO_PIN(2, 2, 4, 0x2B0, 0x6B0),
-	MX51_PIN_DI1_D0_CS = _MXC_BUILD_GPIO_PIN(2, 3, 4, 0x2B4, 0x6B4),
-	MX51_PIN_DI1_D1_CS = _MXC_BUILD_GPIO_PIN(2, 4, 4, 0x2B8, 0x6B8),
-	MX51_PIN_DISPB2_SER_DIN = _MXC_BUILD_GPIO_PIN(2, 5, 4, 0x2BC, 0x6BC),
-	MX51_PIN_DISPB2_SER_DIO = _MXC_BUILD_GPIO_PIN(2, 6, 4, 0x2C0, 0x6C0),
-	MX51_PIN_DISPB2_SER_CLK = _MXC_BUILD_GPIO_PIN(2, 7, 4, 0x2C4, 0x6C4),
-	MX51_PIN_DISPB2_SER_RS = _MXC_BUILD_GPIO_PIN(2, 8, 4, 0x2C8, 0x6C8),
-	MX51_PIN_DISP1_DAT0 = _MXC_BUILD_NON_GPIO_PIN(0x2CC, 0x6CC),
-	MX51_PIN_DISP1_DAT1 = _MXC_BUILD_NON_GPIO_PIN(0x2D0, 0x6D0),
-	MX51_PIN_DISP1_DAT2 = _MXC_BUILD_NON_GPIO_PIN(0x2D4, 0x6D4),
-	MX51_PIN_DISP1_DAT3 = _MXC_BUILD_NON_GPIO_PIN(0x2D8, 0x6D8),
-	MX51_PIN_DISP1_DAT4 = _MXC_BUILD_NON_GPIO_PIN(0x2DC, 0x6DC),
-	MX51_PIN_DISP1_DAT5 = _MXC_BUILD_NON_GPIO_PIN(0x2E0, 0x6E0),
-	MX51_PIN_DISP1_DAT6 = _MXC_BUILD_NON_GPIO_PIN(0x2E4, 0x6E4),
-	MX51_PIN_DISP1_DAT7 = _MXC_BUILD_NON_GPIO_PIN(0x2E8, 0x6E8),
-	MX51_PIN_DISP1_DAT8 = _MXC_BUILD_NON_GPIO_PIN(0x2EC, 0x6EC),
-	MX51_PIN_DISP1_DAT9 = _MXC_BUILD_NON_GPIO_PIN(0x2F0, 0x6F0),
-	MX51_PIN_DISP1_DAT10 = _MXC_BUILD_NON_GPIO_PIN(0x2F4, 0x6F4),
-	MX51_PIN_DISP1_DAT11 = _MXC_BUILD_NON_GPIO_PIN(0x2F8, 0x6F8),
-	MX51_PIN_DISP1_DAT12 = _MXC_BUILD_NON_GPIO_PIN(0x2FC, 0x6FC),
-	MX51_PIN_DISP1_DAT13 = _MXC_BUILD_NON_GPIO_PIN(0x300, 0x700),
-	MX51_PIN_DISP1_DAT14 = _MXC_BUILD_NON_GPIO_PIN(0x304, 0x704),
-	MX51_PIN_DISP1_DAT15 = _MXC_BUILD_NON_GPIO_PIN(0x308, 0x708),
-	MX51_PIN_DISP1_DAT16 = _MXC_BUILD_NON_GPIO_PIN(0x30C, 0x70C),
-	MX51_PIN_DISP1_DAT17 = _MXC_BUILD_NON_GPIO_PIN(0x310, 0x710),
-	MX51_PIN_DISP1_DAT18 = _MXC_BUILD_NON_GPIO_PIN(0x314, 0x714),
-	MX51_PIN_DISP1_DAT19 = _MXC_BUILD_NON_GPIO_PIN(0x318, 0x718),
-	MX51_PIN_DISP1_DAT20 = _MXC_BUILD_NON_GPIO_PIN(0x31C, 0x71C),
-	MX51_PIN_DISP1_DAT21 = _MXC_BUILD_NON_GPIO_PIN(0x320, 0x720),
-	MX51_PIN_DISP1_DAT22 = _MXC_BUILD_NON_GPIO_PIN(0x324, 0x724),
-	MX51_PIN_DISP1_DAT23 = _MXC_BUILD_NON_GPIO_PIN(0x328, 0x728),
-	MX51_PIN_DI1_PIN3 = _MXC_BUILD_NON_GPIO_PIN(0x32C, 0x72C),
-	MX51_PIN_DI1_PIN2 = _MXC_BUILD_NON_GPIO_PIN(0x330, 0x734),
-	MX51_PIN_DI_GP1 = _MXC_BUILD_NON_GPIO_PIN(0x334, 0x73C),
-	MX51_PIN_DI_GP2 = _MXC_BUILD_NON_GPIO_PIN(0x338, 0x740),
-	MX51_PIN_DI_GP3 = _MXC_BUILD_NON_GPIO_PIN(0x33C, 0x744),
-	MX51_PIN_DI2_PIN4 = _MXC_BUILD_NON_GPIO_PIN(0x340, 0x748),
-	MX51_PIN_DI2_PIN2 = _MXC_BUILD_NON_GPIO_PIN(0x344, 0x74C),
-	MX51_PIN_DI2_PIN3 = _MXC_BUILD_NON_GPIO_PIN(0x348, 0x750),
-	MX51_PIN_DI2_DISP_CLK = _MXC_BUILD_NON_GPIO_PIN(0x34C, 0x754),
-	MX51_PIN_DI_GP4 = _MXC_BUILD_NON_GPIO_PIN(0x350, 0x758),
-	MX51_PIN_DISP2_DAT0 = _MXC_BUILD_NON_GPIO_PIN(0x354, 0x75C),
-	MX51_PIN_DISP2_DAT1 = _MXC_BUILD_NON_GPIO_PIN(0x358, 0x760),
-	MX51_PIN_DISP2_DAT2 = _MXC_BUILD_NON_GPIO_PIN(0x35C, 0x764),
-	MX51_PIN_DISP2_DAT3 = _MXC_BUILD_NON_GPIO_PIN(0x360, 0x768),
-	MX51_PIN_DISP2_DAT4 = _MXC_BUILD_NON_GPIO_PIN(0x364, 0x76C),
-	MX51_PIN_DISP2_DAT5 = _MXC_BUILD_NON_GPIO_PIN(0x368, 0x770),
-	MX51_PIN_DISP2_DAT6 = _MXC_BUILD_GPIO_PIN(0, 19, 5, 0x36C, 0x774),
-	MX51_PIN_DISP2_DAT7 = _MXC_BUILD_GPIO_PIN(0, 29, 5, 0x370, 0x778),
-	MX51_PIN_DISP2_DAT8 = _MXC_BUILD_GPIO_PIN(0, 30, 5, 0x374, 0x77C),
-	MX51_PIN_DISP2_DAT9 = _MXC_BUILD_GPIO_PIN(0, 31, 5, 0x378, 0x780),
-	MX51_PIN_DISP2_DAT10 = _MXC_BUILD_NON_GPIO_PIN(0x37C, 0x784),
-	MX51_PIN_DISP2_DAT11 = _MXC_BUILD_GPIO_PIN(0, 10, 7, 0x380, 0x788),
-	MX51_PIN_DISP2_DAT12 = _MXC_BUILD_NON_GPIO_PIN(0x384, 0x78C),
-	MX51_PIN_DISP2_DAT13 = _MXC_BUILD_NON_GPIO_PIN(0x388, 0x790),
-	MX51_PIN_DISP2_DAT14 = _MXC_BUILD_NON_GPIO_PIN(0x38C, 0x794),
-	MX51_PIN_DISP2_DAT15 = _MXC_BUILD_NON_GPIO_PIN(0x390, 0x798),
-	MX51_PIN_SD1_CMD = _MXC_BUILD_NON_GPIO_PIN(0x394, 0x79C),
-	MX51_PIN_SD1_CLK = _MXC_BUILD_NON_GPIO_PIN(0x398, 0x7A0),
-	MX51_PIN_SD1_DATA0 = _MXC_BUILD_NON_GPIO_PIN(0x39C, 0x7A4),
-	MX51_PIN_SD1_DATA1 = _MXC_BUILD_NON_GPIO_PIN(0x3A0, 0x7A8),
-	MX51_PIN_SD1_DATA2 = _MXC_BUILD_NON_GPIO_PIN(0x3A4, 0x7AC),
-	MX51_PIN_SD1_DATA3 = _MXC_BUILD_NON_GPIO_PIN(0x3A8, 0x7B0),
-	MX51_PIN_GPIO1_0 = _MXC_BUILD_GPIO_PIN(0, 0, 1, 0x3AC, 0x7B4),
-	MX51_PIN_GPIO1_1 = _MXC_BUILD_GPIO_PIN(0, 1, 1, 0x3B0, 0x7B8),
-	MX51_PIN_SD2_CMD = _MXC_BUILD_NON_GPIO_PIN(0x3B4, 0x7BC),
-	MX51_PIN_SD2_CLK = _MXC_BUILD_NON_GPIO_PIN(0x3B8, 0x7C0),
-	MX51_PIN_SD2_DATA0 = _MXC_BUILD_NON_GPIO_PIN(0x3BC, 0x7C4),
-	MX51_PIN_SD2_DATA1 = _MXC_BUILD_NON_GPIO_PIN(0x3C0, 0x7C8),
-	MX51_PIN_SD2_DATA2 = _MXC_BUILD_NON_GPIO_PIN(0x3C4, 0x7CC),
-	MX51_PIN_SD2_DATA3 = _MXC_BUILD_NON_GPIO_PIN(0x3C8, 0x7D0),
-	MX51_PIN_GPIO1_2 = _MXC_BUILD_GPIO_PIN(0, 2, 0, 0x3CC, 0x7D4),
-	MX51_PIN_GPIO1_3 = _MXC_BUILD_GPIO_PIN(0, 3, 0, 0x3D0, 0x7D8),
-	MX51_PIN_PMIC_INT_REQ = _MXC_BUILD_NON_GPIO_PIN(0x3D4, 0x7FC),
-	MX51_PIN_GPIO1_4 = _MXC_BUILD_GPIO_PIN(0, 4, 0, 0x3D8, 0x804),
-	MX51_PIN_GPIO1_5 = _MXC_BUILD_GPIO_PIN(0, 5, 0, 0x3DC, 0x808),
-	MX51_PIN_GPIO1_6 = _MXC_BUILD_GPIO_PIN(0, 6, 0, 0x3E0, 0x80C),
-	MX51_PIN_GPIO1_7 = _MXC_BUILD_GPIO_PIN(0, 7, 0, 0x3E4, 0x810),
-	MX51_PIN_GPIO1_8 = _MXC_BUILD_GPIO_PIN(0, 8, 0, 0x3E8, 0x814),
-	MX51_PIN_GPIO1_9 = _MXC_BUILD_GPIO_PIN(0, 9, 0, 0x3EC, 0x818),
-};
-
-#endif				/* __ASSEMBLY__ */
-#endif				/* __ASM_ARCH_MXC_MX51_PINS_H__ */
diff --git a/arch/arm/mach-mx51/pm.c b/arch/arm/mach-mx51/pm.c
deleted file mode 100644
index 86fc29a708a7..000000000000
--- a/arch/arm/mach-mx51/pm.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- *  Copyright (C) 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/io.h>
-#include <linux/kernel.h>
-#include <linux/clk.h>
-#include <linux/platform_device.h>
-#include <linux/regulator/consumer.h>
-#include <linux/suspend.h>
-#include <linux/proc_fs.h>
-#include <linux/cpufreq.h>
-#include <linux/iram_alloc.h>
-#include <asm/cacheflush.h>
-#include <asm/tlb.h>
-#include <asm/mach/map.h>
-#include <mach/hardware.h>
-#include "crm_regs.h"
-
-static struct cpu_wp *cpu_wp_tbl;
-static struct clk *cpu_clk;
-
-#if defined(CONFIG_CPU_FREQ_IMX)
-static int org_freq;
-extern int cpufreq_suspended;
-extern int set_cpu_freq(int wp);
-#endif
-
-
-static struct device *pm_dev;
-struct clk *gpc_dvfs_clk;
-extern void cpu_do_suspend_workaround(u32 sdclk_iomux_addr);
-extern void cpu_cortexa8_do_idle(void *);
-extern struct cpu_wp *(*get_cpu_wp)(int *wp);
-
-extern int iram_ready;
-void *suspend_iram_base;
-void (*suspend_in_iram)(void *sdclk_iomux_addr) = NULL;
-
-static int mx51_suspend_enter(suspend_state_t state)
-{
-	void __iomem *sdclk_iomux_addr = IO_ADDRESS(IOMUXC_BASE_ADDR + 0x4b8);
-
-	if (gpc_dvfs_clk == NULL)
-		gpc_dvfs_clk = clk_get(NULL, "gpc_dvfs_clk");
-	/* gpc clock is needed for SRPG */
-	clk_enable(gpc_dvfs_clk);
-	switch (state) {
-	case PM_SUSPEND_MEM:
-		mxc_cpu_lp_set(STOP_POWER_OFF);
-		break;
-	case PM_SUSPEND_STANDBY:
-		mxc_cpu_lp_set(WAIT_UNCLOCKED_POWER_OFF);
-		break;
-	default:
-		return -EINVAL;
-	}
-
-	if (tzic_enable_wake(0) != 0)
-		return -EAGAIN;
-
-	if (state == PM_SUSPEND_MEM) {
-		local_flush_tlb_all();
-		flush_cache_all();
-
-		/* Run the suspend code from iRAM. */
-		suspend_in_iram(sdclk_iomux_addr);
-
-		/*clear the EMPGC0/1 bits */
-		__raw_writel(0, MXC_SRPG_EMPGC0_SRPGCR);
-		__raw_writel(0, MXC_SRPG_EMPGC1_SRPGCR);
-	} else {
-			cpu_do_idle();
-	}
-	clk_disable(gpc_dvfs_clk);
-
-	return 0;
-}
-
-/*
- * Called after processes are frozen, but before we shut down devices.
- */
-static int mx51_suspend_prepare(void)
-{
-#if defined(CONFIG_CPU_FREQ_IMX)
-	struct cpufreq_freqs freqs;
-	org_freq = clk_get_rate(cpu_clk);
-	freqs.old = org_freq / 1000;
-	freqs.new = cpu_wp_tbl[0].cpu_rate / 1000;
-	freqs.cpu = 0;
-	freqs.flags = 0;
-
-	cpufreq_suspended = 1;
-	if (clk_get_rate(cpu_clk) != cpu_wp_tbl[0].cpu_rate) {
-		set_cpu_freq(cpu_wp_tbl[0].cpu_rate);
-		cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-		cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-	}
-#endif
-	return 0;
-}
-
-/*
- * Called before devices are re-setup.
- */
-static void mx51_suspend_finish(void)
-{
-#if defined(CONFIG_CPU_FREQ_IMX)
-	struct cpufreq_freqs freqs;
-
-	freqs.old = clk_get_rate(cpu_clk) / 1000;
-	freqs.new = org_freq / 1000;
-	freqs.cpu = 0;
-	freqs.flags = 0;
-
-	cpufreq_suspended = 0;
-
-	if (org_freq != clk_get_rate(cpu_clk)) {
-		set_cpu_freq(org_freq);
-		cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
-		cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
-	}
-#endif
-}
-
-/*
- * Called after devices are re-setup, but before processes are thawed.
- */
-static void mx51_suspend_end(void)
-{
-}
-
-static int mx51_pm_valid(suspend_state_t state)
-{
-	return (state > PM_SUSPEND_ON && state <= PM_SUSPEND_MAX);
-}
-
-struct platform_suspend_ops mx51_suspend_ops = {
-	.valid = mx51_pm_valid,
-	.prepare = mx51_suspend_prepare,
-	.enter = mx51_suspend_enter,
-	.finish = mx51_suspend_finish,
-	.end = mx51_suspend_end,
-};
-
-
-static int __devinit mx51_pm_probe(struct platform_device *pdev)
-{
-	pm_dev = &pdev->dev;
-	return 0;
-}
-
-static struct platform_driver mx51_pm_driver = {
-	.driver = {
-		   .name = "mx51_pm",
-		   },
-	.probe = mx51_pm_probe,
-};
-
-static int __init pm_init(void)
-{
-	int cpu_wp_nr;
-	unsigned long iram_paddr;
-
-	pr_info("Static Power Management for Freescale i.MX51\n");
-	if (platform_driver_register(&mx51_pm_driver) != 0) {
-		printk(KERN_ERR "mx51_pm_driver register failed\n");
-		return -ENODEV;
-	}
-	suspend_set_ops(&mx51_suspend_ops);
-	/* Move suspend routine into iRAM */
-	iram_alloc(SZ_4K, &iram_paddr);
-	/* Need to remap the area here since we want the memory region
-		 to be executable. */
-	suspend_iram_base = __arm_ioremap(iram_paddr, SZ_4K,
-					  MT_HIGH_VECTORS);
-	memcpy(suspend_iram_base, cpu_do_suspend_workaround, SZ_4K);
-	suspend_in_iram = (void *)suspend_iram_base;
-
-	cpu_wp_tbl = get_cpu_wp(&cpu_wp_nr);
-
-	cpu_clk = clk_get(NULL, "cpu_clk");
-	if (IS_ERR(cpu_clk)) {
-		printk(KERN_DEBUG "%s: failed to get cpu_clk\n", __func__);
-		return PTR_ERR(cpu_clk);
-	}
-	printk(KERN_INFO "PM driver module loaded\n");
-
-	return 0;
-}
-
-
-static void __exit pm_cleanup(void)
-{
-	/* Unregister the device structure */
-	platform_driver_unregister(&mx51_pm_driver);
-}
-
-module_init(pm_init);
-module_exit(pm_cleanup);
-
-MODULE_AUTHOR("Freescale Semiconductor, Inc.");
-MODULE_DESCRIPTION("PM driver");
-MODULE_LICENSE("GPL");
diff --git a/arch/arm/mach-mx51/serial.c b/arch/arm/mach-mx51/serial.c
deleted file mode 100644
index 83db40a0adbe..000000000000
--- a/arch/arm/mach-mx51/serial.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (C) 2008-2010 Freescale Semiconductor, Inc. All Rights Reserved.
- */
-
-/*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-/*!
- * @file mach-mx51/serial.c
- *
- * @brief This file contains the UART initiliazation.
- *
- * @ingroup MSL_MX51
- */
-#include <linux/module.h>
-#include <linux/platform_device.h>
-#include <linux/serial.h>
-#include <mach/hardware.h>
-#include <mach/mxc_uart.h>
-#include "serial.h"
-#include "board.h"
-
-#if defined(CONFIG_SERIAL_MXC) || defined(CONFIG_SERIAL_MXC_MODULE)
-
-/*!
- * This is an array where each element holds information about a UART port,
- * like base address of the UART, interrupt numbers etc. This structure is
- * passed to the serial_core.c file. Based on which UART is used, the core file
- * passes back the appropriate port structure as an argument to the control
- * functions.
- */
-static uart_mxc_port mxc_ports[] = {
-	[0] = {
-	       .port = {
-			.membase = (void *)IO_ADDRESS(UART1_BASE_ADDR),
-			.mapbase = UART1_BASE_ADDR,
-			.iotype = SERIAL_IO_MEM,
-			.irq = UART1_INT1,
-			.fifosize = 32,
-			.flags = ASYNC_BOOT_AUTOCONF,
-			.line = 0,
-			},
-	       .ints_muxed = UART1_MUX_INTS,
-	       .irqs = {UART1_INT2, UART1_INT3},
-	       .mode = UART1_MODE,
-	       .ir_mode = UART1_IR,
-	       .enabled = UART1_ENABLED,
-	       .hardware_flow = UART1_HW_FLOW,
-	       .cts_threshold = UART1_UCR4_CTSTL,
-	       .dma_enabled = UART1_DMA_ENABLE,
-	       .dma_rxbuf_size = UART1_DMA_RXBUFSIZE,
-	       .rx_threshold = UART1_UFCR_RXTL,
-	       .tx_threshold = UART1_UFCR_TXTL,
-	       .dma_tx_id = MXC_DMA_UART1_TX,
-	       .dma_rx_id = MXC_DMA_UART1_RX,
-	       .rxd_mux = MXC_UART_RXDMUX,
-	       },
-	[1] = {
-	       .port = {
-			.membase = (void *)IO_ADDRESS(UART2_BASE_ADDR),
-			.mapbase = UART2_BASE_ADDR,
-			.iotype = SERIAL_IO_MEM,
-			.irq = UART2_INT1,
-			.fifosize = 32,
-			.flags = ASYNC_BOOT_AUTOCONF,
-			.line = 1,
-			},
-	       .ints_muxed = UART2_MUX_INTS,
-	       .irqs = {UART2_INT2, UART2_INT3},
-	       .mode = UART2_MODE,
-	       .ir_mode = UART2_IR,
-	       .enabled = UART2_ENABLED,
-	       .hardware_flow = UART2_HW_FLOW,
-	       .cts_threshold = UART2_UCR4_CTSTL,
-	       .dma_enabled = UART2_DMA_ENABLE,
-	       .dma_rxbuf_size = UART2_DMA_RXBUFSIZE,
-	       .rx_threshold = UART2_UFCR_RXTL,
-	       .tx_threshold = UART2_UFCR_TXTL,
-	       .dma_tx_id = MXC_DMA_UART2_TX,
-	       .dma_rx_id = MXC_DMA_UART2_RX,
-	       .rxd_mux = MXC_UART_RXDMUX,
-	       },
-	[2] = {
-	       .port = {
-			.membase = (void *)IO_ADDRESS(UART3_BASE_ADDR),
-			.mapbase = UART3_BASE_ADDR,
-			.iotype = SERIAL_IO_MEM,
-			.irq = UART3_INT1,
-			.fifosize = 32,
-			.flags = ASYNC_BOOT_AUTOCONF,
-			.line = 2,
-			},
-	       .ints_muxed = UART3_MUX_INTS,
-	       .irqs = {UART3_INT2, UART3_INT3},
-	       .mode = UART3_MODE,
-	       .ir_mode = UART3_IR,
-	       .enabled = UART3_ENABLED,
-	       .hardware_flow = UART3_HW_FLOW,
-	       .cts_threshold = UART3_UCR4_CTSTL,
-	       .dma_enabled = UART3_DMA_ENABLE,
-	       .dma_rxbuf_size = UART3_DMA_RXBUFSIZE,
-	       .rx_threshold = UART3_UFCR_RXTL,
-	       .tx_threshold = UART3_UFCR_TXTL,
-	       .dma_tx_id = MXC_DMA_UART3_TX,
-	       .dma_rx_id = MXC_DMA_UART3_RX,
-	       .rxd_mux = MXC_UART_RXDMUX,
-	       },
-};
-
-#if defined CONFIG_UART1_ENABLED
-static struct platform_device mxc_uart_device1 = {
-	.name = "mxcintuart",
-	.id = 0,
-	.dev = {
-		.platform_data = &mxc_ports[0],
-		},
-};
-#endif
-
-#if defined CONFIG_UART2_ENABLED
-static struct platform_device mxc_uart_device2 = {
-	.name = "mxcintuart",
-	.id = 1,
-	.dev = {
-		.platform_data = &mxc_ports[1],
-		},
-};
-#endif
-
-#if defined CONFIG_UART3_ENABLED
-static struct platform_device mxc_uart_device3 = {
-	.name = "mxcintuart",
-	.id = 2,
-	.dev = {
-		.platform_data = &mxc_ports[2],
-		},
-};
-#endif
-
-static int __init mxc_init_uart(void)
-{
-	/* Register all the MXC UART platform device structures */
-#if defined CONFIG_UART1_ENABLED
-	platform_device_register(&mxc_uart_device1);
-#endif
-#if defined CONFIG_UART2_ENABLED
-	platform_device_register(&mxc_uart_device2);
-#endif
-
-	/* Grab ownership of shared UARTs 3 and 4, only when enabled */
-#if defined CONFIG_UART3_ENABLED
-	platform_device_register(&mxc_uart_device3);
-#endif				/* UART3_ENABLED */
-	return 0;
-}
-
-#else
-static int __init mxc_init_uart(void)
-{
-	return 0;
-}
-#endif
-
-arch_initcall(mxc_init_uart);
diff --git a/arch/arm/mach-stmp378x/include/mach/regs-axi_ahb0.h b/arch/arm/mach-stmp378x/include/mach/regs-axi_ahb0.h
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/arch/arm/mach-stmp378x/include/mach/regs-axi_ahb0.h
+++ /dev/null
diff --git a/drivers/mtd/nand/mxc_nd2.h b/drivers/mtd/nand/mxc_nd2.h
index 16211706e9b9..ea128f6da41b 100644
--- a/drivers/mtd/nand/mxc_nd2.h
+++ b/drivers/mtd/nand/mxc_nd2.h
@@ -41,7 +41,7 @@
  * For V3 NFC registers Definition
  */
 /* AXI Bus Mapped */
-#define NFC_AXI_BASE_ADDR		NFC_BASE_ADDR_AXI
+#define NFC_AXI_BASE_ADDR		MX51_NFC_BASE_ADDR_AXI
 
 #if defined(CONFIG_ARCH_MXC_HAS_NFC_V3_1)	/* mx37 */
 #define MXC_INT_NANDFC			MXC_INT_EMI
diff --git a/drivers/mxc/ipu3/ipu_disp.c b/drivers/mxc/ipu3/ipu_disp.c
index b432cb9df734..00c5008d149f 100644
--- a/drivers/mxc/ipu3/ipu_disp.c
+++ b/drivers/mxc/ipu3/ipu_disp.c
@@ -954,7 +954,7 @@ int32_t ipu_init_sync_panel(int disp, uint32_t pixel_clk,
 	if ((v_sync_width == 0) || (h_sync_width == 0))
 		return EINVAL;
 
-	adapt_panel_to_ipu_restricitions((uint16_t *)&pixel_clk, width, height,
+	adapt_panel_to_ipu_restricitions((uint32_t *)&pixel_clk, width, height,
 					 h_start_width, h_end_width,
 					 v_start_width, &v_end_width);
 	h_total = width + h_sync_width + h_start_width + h_end_width;
diff --git a/drivers/net/wireless/ath6kl/os/linux/include/athendpack_linux.h b/drivers/net/wireless/ath6kl/os/linux/include/athendpack_linux.h
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/drivers/net/wireless/ath6kl/os/linux/include/athendpack_linux.h
+++ /dev/null
diff --git a/drivers/net/wireless/ath6kl/os/linux/include/athstartpack_linux.h b/drivers/net/wireless/ath6kl/os/linux/include/athstartpack_linux.h
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/drivers/net/wireless/ath6kl/os/linux/include/athstartpack_linux.h
+++ /dev/null
diff --git a/include/asm-arm/mach-types.h b/include/asm-arm/mach-types.h
deleted file mode 100644
index d52404f6f152..000000000000
--- a/include/asm-arm/mach-types.h
+++ /dev/null
@@ -1,31432 +0,0 @@
-/*
- * This was automagically generated from arch/arm/tools/mach-types!
- * Do NOT edit
- */
-
-#ifndef __ASM_ARM_MACH_TYPE_H
-#define __ASM_ARM_MACH_TYPE_H
-
-#ifndef __ASSEMBLY__
-/* The type of machine we're running on */
-extern unsigned int __machine_arch_type;
-#endif
-
-/* see arch/arm/kernel/arch.c for a description of these */
-#define MACH_TYPE_EBSA110              0
-#define MACH_TYPE_RISCPC               1
-#define MACH_TYPE_NEXUSPCI             3
-#define MACH_TYPE_EBSA285              4
-#define MACH_TYPE_NETWINDER            5
-#define MACH_TYPE_CATS                 6
-#define MACH_TYPE_TBOX                 7
-#define MACH_TYPE_CO285                8
-#define MACH_TYPE_CLPS7110             9
-#define MACH_TYPE_ARCHIMEDES           10
-#define MACH_TYPE_A5K                  11
-#define MACH_TYPE_ETOILE               12
-#define MACH_TYPE_LACIE_NAS            13
-#define MACH_TYPE_CLPS7500             14
-#define MACH_TYPE_SHARK                15
-#define MACH_TYPE_BRUTUS               16
-#define MACH_TYPE_PERSONAL_SERVER      17
-#define MACH_TYPE_ITSY                 18
-#define MACH_TYPE_L7200                19
-#define MACH_TYPE_PLEB                 20
-#define MACH_TYPE_INTEGRATOR           21
-#define MACH_TYPE_H3600                22
-#define MACH_TYPE_IXP1200              23
-#define MACH_TYPE_P720T                24
-#define MACH_TYPE_ASSABET              25
-#define MACH_TYPE_VICTOR               26
-#define MACH_TYPE_LART                 27
-#define MACH_TYPE_RANGER               28
-#define MACH_TYPE_GRAPHICSCLIENT       29
-#define MACH_TYPE_XP860                30
-#define MACH_TYPE_CERF                 31
-#define MACH_TYPE_NANOENGINE           32
-#define MACH_TYPE_FPIC                 33
-#define MACH_TYPE_EXTENEX1             34
-#define MACH_TYPE_SHERMAN              35
-#define MACH_TYPE_ACCELENT_SA          36
-#define MACH_TYPE_ACCELENT_L7200       37
-#define MACH_TYPE_NETPORT              38
-#define MACH_TYPE_PANGOLIN             39
-#define MACH_TYPE_YOPY                 40
-#define MACH_TYPE_COOLIDGE             41
-#define MACH_TYPE_HUW_WEBPANEL         42
-#define MACH_TYPE_SPOTME               43
-#define MACH_TYPE_FREEBIRD             44
-#define MACH_TYPE_TI925                45
-#define MACH_TYPE_RISCSTATION          46
-#define MACH_TYPE_CAVY                 47
-#define MACH_TYPE_JORNADA720           48
-#define MACH_TYPE_OMNIMETER            49
-#define MACH_TYPE_EDB7211              50
-#define MACH_TYPE_CITYGO               51
-#define MACH_TYPE_PFS168               52
-#define MACH_TYPE_SPOT                 53
-#define MACH_TYPE_FLEXANET             54
-#define MACH_TYPE_WEBPAL               55
-#define MACH_TYPE_LINPDA               56
-#define MACH_TYPE_ANAKIN               57
-#define MACH_TYPE_MVI                  58
-#define MACH_TYPE_JUPITER              59
-#define MACH_TYPE_PSIONW               60
-#define MACH_TYPE_ALN                  61
-#define MACH_TYPE_CAMELOT              62
-#define MACH_TYPE_GDS2200              63
-#define MACH_TYPE_PSION_SERIES7        64
-#define MACH_TYPE_XFILE                65
-#define MACH_TYPE_ACCELENT_EP9312      66
-#define MACH_TYPE_IC200                67
-#define MACH_TYPE_CREDITLART           68
-#define MACH_TYPE_HTM                  69
-#define MACH_TYPE_IQ80310              70
-#define MACH_TYPE_FREEBOT              71
-#define MACH_TYPE_ENTEL                72
-#define MACH_TYPE_ENP3510              73
-#define MACH_TYPE_TRIZEPS              74
-#define MACH_TYPE_NESA                 75
-#define MACH_TYPE_VENUS                76
-#define MACH_TYPE_TARDIS               77
-#define MACH_TYPE_MERCURY              78
-#define MACH_TYPE_EMPEG                79
-#define MACH_TYPE_I80200FCC            80
-#define MACH_TYPE_ITT_CPB              81
-#define MACH_TYPE_SVC                  82
-#define MACH_TYPE_ALPHA2               84
-#define MACH_TYPE_ALPHA1               85
-#define MACH_TYPE_NETARM               86
-#define MACH_TYPE_SIMPAD               87
-#define MACH_TYPE_PDA1                 88
-#define MACH_TYPE_LUBBOCK              89
-#define MACH_TYPE_ANIKO                90
-#define MACH_TYPE_CLEP7212             91
-#define MACH_TYPE_CS89712              92
-#define MACH_TYPE_WEARARM              93
-#define MACH_TYPE_POSSIO_PX            94
-#define MACH_TYPE_SIDEARM              95
-#define MACH_TYPE_STORK                96
-#define MACH_TYPE_SHANNON              97
-#define MACH_TYPE_ACE                  98
-#define MACH_TYPE_BALLYARM             99
-#define MACH_TYPE_SIMPUTER             100
-#define MACH_TYPE_NEXTERM              101
-#define MACH_TYPE_SA1100_ELF           102
-#define MACH_TYPE_GATOR                103
-#define MACH_TYPE_GRANITE              104
-#define MACH_TYPE_CONSUS               105
-#define MACH_TYPE_AAED2000             106
-#define MACH_TYPE_CDB89712             107
-#define MACH_TYPE_GRAPHICSMASTER       108
-#define MACH_TYPE_ADSBITSY             109
-#define MACH_TYPE_PXA_IDP              110
-#define MACH_TYPE_PLCE                 111
-#define MACH_TYPE_PT_SYSTEM3           112
-#define MACH_TYPE_MEDALB               113
-#define MACH_TYPE_EAGLE                114
-#define MACH_TYPE_DSC21                115
-#define MACH_TYPE_DSC24                116
-#define MACH_TYPE_TI5472               117
-#define MACH_TYPE_AUTCPU12             118
-#define MACH_TYPE_UENGINE              119
-#define MACH_TYPE_BLUESTEM             120
-#define MACH_TYPE_XINGU8               121
-#define MACH_TYPE_BUSHSTB              122
-#define MACH_TYPE_EPSILON1             123
-#define MACH_TYPE_BALLOON              124
-#define MACH_TYPE_PUPPY                125
-#define MACH_TYPE_ELROY                126
-#define MACH_TYPE_GMS720               127
-#define MACH_TYPE_S24X                 128
-#define MACH_TYPE_JTEL_CLEP7312        129
-#define MACH_TYPE_CX821XX              130
-#define MACH_TYPE_EDB7312              131
-#define MACH_TYPE_BSA1110              132
-#define MACH_TYPE_POWERPIN             133
-#define MACH_TYPE_OPENARM              134
-#define MACH_TYPE_WHITECHAPEL          135
-#define MACH_TYPE_H3100                136
-#define MACH_TYPE_H3800                137
-#define MACH_TYPE_BLUE_V1              138
-#define MACH_TYPE_PXA_CERF             139
-#define MACH_TYPE_ARM7TEVB             140
-#define MACH_TYPE_D7400                141
-#define MACH_TYPE_PIRANHA              142
-#define MACH_TYPE_SBCAMELOT            143
-#define MACH_TYPE_KINGS                144
-#define MACH_TYPE_SMDK2400             145
-#define MACH_TYPE_COLLIE               146
-#define MACH_TYPE_IDR                  147
-#define MACH_TYPE_BADGE4               148
-#define MACH_TYPE_WEBNET               149
-#define MACH_TYPE_D7300                150
-#define MACH_TYPE_CEP                  151
-#define MACH_TYPE_FORTUNET             152
-#define MACH_TYPE_VC547X               153
-#define MACH_TYPE_FILEWALKER           154
-#define MACH_TYPE_NETGATEWAY           155
-#define MACH_TYPE_SYMBOL2800           156
-#define MACH_TYPE_SUNS                 157
-#define MACH_TYPE_FRODO                158
-#define MACH_TYPE_MACH_TYTE_MS301      159
-#define MACH_TYPE_MX1ADS               160
-#define MACH_TYPE_H7201                161
-#define MACH_TYPE_H7202                162
-#define MACH_TYPE_AMICO                163
-#define MACH_TYPE_IAM                  164
-#define MACH_TYPE_TT530                165
-#define MACH_TYPE_SAM2400              166
-#define MACH_TYPE_JORNADA56X           167
-#define MACH_TYPE_ACTIVE               168
-#define MACH_TYPE_IQ80321              169
-#define MACH_TYPE_WID                  170
-#define MACH_TYPE_SABINAL              171
-#define MACH_TYPE_IXP425_MATACUMBE     172
-#define MACH_TYPE_MINIPRINT            173
-#define MACH_TYPE_ADM510X              174
-#define MACH_TYPE_SVS200               175
-#define MACH_TYPE_ATG_TCU              176
-#define MACH_TYPE_JORNADA820           177
-#define MACH_TYPE_S3C44B0              178
-#define MACH_TYPE_MARGIS2              179
-#define MACH_TYPE_KS8695               180
-#define MACH_TYPE_BRH                  181
-#define MACH_TYPE_S3C2410              182
-#define MACH_TYPE_POSSIO_PX30          183
-#define MACH_TYPE_S3C2800              184
-#define MACH_TYPE_FLEETWOOD            185
-#define MACH_TYPE_OMAHA                186
-#define MACH_TYPE_TA7                  187
-#define MACH_TYPE_NOVA                 188
-#define MACH_TYPE_HMK                  189
-#define MACH_TYPE_KARO                 190
-#define MACH_TYPE_FESTER               191
-#define MACH_TYPE_GPI                  192
-#define MACH_TYPE_SMDK2410             193
-#define MACH_TYPE_I519                 194
-#define MACH_TYPE_NEXIO                195
-#define MACH_TYPE_BITBOX               196
-#define MACH_TYPE_G200                 197
-#define MACH_TYPE_GILL                 198
-#define MACH_TYPE_PXA_MERCURY          199
-#define MACH_TYPE_CEIVA                200
-#define MACH_TYPE_FRET                 201
-#define MACH_TYPE_EMAILPHONE           202
-#define MACH_TYPE_H3900                203
-#define MACH_TYPE_PXA1                 204
-#define MACH_TYPE_KOAN369              205
-#define MACH_TYPE_COGENT               206
-#define MACH_TYPE_ESL_SIMPUTER         207
-#define MACH_TYPE_ESL_SIMPUTER_CLR     208
-#define MACH_TYPE_ESL_SIMPUTER_BW      209
-#define MACH_TYPE_HHP_CRADLE           210
-#define MACH_TYPE_HE500                211
-#define MACH_TYPE_INHANDELF2           212
-#define MACH_TYPE_INHANDFTIP           213
-#define MACH_TYPE_DNP1110              214
-#define MACH_TYPE_PNP1110              215
-#define MACH_TYPE_CSB226               216
-#define MACH_TYPE_ARNOLD               217
-#define MACH_TYPE_VOICEBLUE            218
-#define MACH_TYPE_JZ8028               219
-#define MACH_TYPE_H5400                220
-#define MACH_TYPE_FORTE                221
-#define MACH_TYPE_ACAM                 222
-#define MACH_TYPE_ABOX                 223
-#define MACH_TYPE_ATMEL                224
-#define MACH_TYPE_SITSANG              225
-#define MACH_TYPE_CPU1110LCDNET        226
-#define MACH_TYPE_MPL_VCMA9            227
-#define MACH_TYPE_OPUS_A1              228
-#define MACH_TYPE_DAYTONA              229
-#define MACH_TYPE_KILLBEAR             230
-#define MACH_TYPE_YOHO                 231
-#define MACH_TYPE_JASPER               232
-#define MACH_TYPE_DSC25                233
-#define MACH_TYPE_OMAP_INNOVATOR       234
-#define MACH_TYPE_RAMSES               235
-#define MACH_TYPE_S28X                 236
-#define MACH_TYPE_MPORT3               237
-#define MACH_TYPE_PXA_EAGLE250         238
-#define MACH_TYPE_PDB                  239
-#define MACH_TYPE_BLUE_2G              240
-#define MACH_TYPE_BLUEARCH             241
-#define MACH_TYPE_IXDP2400             242
-#define MACH_TYPE_IXDP2800             243
-#define MACH_TYPE_EXPLORER             244
-#define MACH_TYPE_IXDP425              245
-#define MACH_TYPE_CHIMP                246
-#define MACH_TYPE_STORK_NEST           247
-#define MACH_TYPE_STORK_EGG            248
-#define MACH_TYPE_WISMO                249
-#define MACH_TYPE_EZLINX               250
-#define MACH_TYPE_AT91RM9200           251
-#define MACH_TYPE_ADTECH_ORION         252
-#define MACH_TYPE_NEPTUNE              253
-#define MACH_TYPE_HACKKIT              254
-#define MACH_TYPE_PXA_WINS30           255
-#define MACH_TYPE_LAVINNA              256
-#define MACH_TYPE_PXA_UENGINE          257
-#define MACH_TYPE_INNOKOM              258
-#define MACH_TYPE_BMS                  259
-#define MACH_TYPE_IXCDP1100            260
-#define MACH_TYPE_PRPMC1100            261
-#define MACH_TYPE_AT91RM9200DK         262
-#define MACH_TYPE_ARMSTICK             263
-#define MACH_TYPE_ARMONIE              264
-#define MACH_TYPE_MPORT1               265
-#define MACH_TYPE_S3C5410              266
-#define MACH_TYPE_ZCP320A              267
-#define MACH_TYPE_I_BOX                268
-#define MACH_TYPE_STLC1502             269
-#define MACH_TYPE_SIREN                270
-#define MACH_TYPE_GREENLAKE            271
-#define MACH_TYPE_ARGUS                272
-#define MACH_TYPE_COMBADGE             273
-#define MACH_TYPE_ROKEPXA              274
-#define MACH_TYPE_CINTEGRATOR          275
-#define MACH_TYPE_GUIDEA07             276
-#define MACH_TYPE_TAT257               277
-#define MACH_TYPE_IGP2425              278
-#define MACH_TYPE_BLUEGRAMMA           279
-#define MACH_TYPE_IPOD                 280
-#define MACH_TYPE_ADSBITSYX            281
-#define MACH_TYPE_TRIZEPS2             282
-#define MACH_TYPE_VIPER                283
-#define MACH_TYPE_ADSBITSYPLUS         284
-#define MACH_TYPE_ADSAGC               285
-#define MACH_TYPE_STP7312              286
-#define MACH_TYPE_NX_PHNX              287
-#define MACH_TYPE_WEP_EP250            288
-#define MACH_TYPE_INHANDELF3           289
-#define MACH_TYPE_ADI_COYOTE           290
-#define MACH_TYPE_IYONIX               291
-#define MACH_TYPE_DAMICAM_SA1110       292
-#define MACH_TYPE_MEG03                293
-#define MACH_TYPE_PXA_WHITECHAPEL      294
-#define MACH_TYPE_NWSC                 295
-#define MACH_TYPE_NWLARM               296
-#define MACH_TYPE_IXP425_MGUARD        297
-#define MACH_TYPE_PXA_NETDCU4          298
-#define MACH_TYPE_IXDP2401             299
-#define MACH_TYPE_IXDP2801             300
-#define MACH_TYPE_ZODIAC               301
-#define MACH_TYPE_ARMMODUL             302
-#define MACH_TYPE_KETOP                303
-#define MACH_TYPE_AV7200               304
-#define MACH_TYPE_ARCH_TI925           305
-#define MACH_TYPE_ACQ200               306
-#define MACH_TYPE_PT_DAFIT             307
-#define MACH_TYPE_IHBA                 308
-#define MACH_TYPE_QUINQUE              309
-#define MACH_TYPE_NIMBRAONE            310
-#define MACH_TYPE_NIMBRA29X            311
-#define MACH_TYPE_NIMBRA210            312
-#define MACH_TYPE_HHP_D95XX            313
-#define MACH_TYPE_LABARM               314
-#define MACH_TYPE_M825XX               315
-#define MACH_TYPE_M7100                316
-#define MACH_TYPE_NIPC2                317
-#define MACH_TYPE_FU7202               318
-#define MACH_TYPE_ADSAGX               319
-#define MACH_TYPE_PXA_POOH             320
-#define MACH_TYPE_BANDON               321
-#define MACH_TYPE_PCM7210              322
-#define MACH_TYPE_NMS9200              323
-#define MACH_TYPE_LOGODL               324
-#define MACH_TYPE_M7140                325
-#define MACH_TYPE_KOREBOT              326
-#define MACH_TYPE_IQ31244              327
-#define MACH_TYPE_KOAN393              328
-#define MACH_TYPE_INHANDFTIP3          329
-#define MACH_TYPE_GONZO                330
-#define MACH_TYPE_BAST                 331
-#define MACH_TYPE_SCANPASS             332
-#define MACH_TYPE_EP7312_POOH          333
-#define MACH_TYPE_TA7S                 334
-#define MACH_TYPE_TA7V                 335
-#define MACH_TYPE_ICARUS               336
-#define MACH_TYPE_H1900                337
-#define MACH_TYPE_GEMINI               338
-#define MACH_TYPE_AXIM                 339
-#define MACH_TYPE_AUDIOTRON            340
-#define MACH_TYPE_H2200                341
-#define MACH_TYPE_LOOX600              342
-#define MACH_TYPE_NIOP                 343
-#define MACH_TYPE_DM310                344
-#define MACH_TYPE_SEEDPXA_C2           345
-#define MACH_TYPE_IXP4XX_MGUARD_PCI    346
-#define MACH_TYPE_H1940                347
-#define MACH_TYPE_SCORPIO              348
-#define MACH_TYPE_VIVA                 349
-#define MACH_TYPE_PXA_XCARD            350
-#define MACH_TYPE_CSB335               351
-#define MACH_TYPE_IXRD425              352
-#define MACH_TYPE_IQ80315              353
-#define MACH_TYPE_NMP7312              354
-#define MACH_TYPE_CX861XX              355
-#define MACH_TYPE_ENP2611              356
-#define MACH_TYPE_XDA                  357
-#define MACH_TYPE_CSIR_IMS             358
-#define MACH_TYPE_IXP421_DNAEETH       359
-#define MACH_TYPE_POCKETSERV9200       360
-#define MACH_TYPE_TOTO                 361
-#define MACH_TYPE_S3C2440              362
-#define MACH_TYPE_KS8695P              363
-#define MACH_TYPE_SE4000               364
-#define MACH_TYPE_QUADRICEPS           365
-#define MACH_TYPE_BRONCO               366
-#define MACH_TYPE_ESL_WIRELESS_TAB     367
-#define MACH_TYPE_ESL_SOFCOMP          368
-#define MACH_TYPE_S5C7375              369
-#define MACH_TYPE_SPEARHEAD            370
-#define MACH_TYPE_PANTERA              371
-#define MACH_TYPE_PRAYOGLITE           372
-#define MACH_TYPE_GUMSTIX              373
-#define MACH_TYPE_RCUBE                374
-#define MACH_TYPE_REA_OLV              375
-#define MACH_TYPE_PXA_IPHONE           376
-#define MACH_TYPE_S3C3410              377
-#define MACH_TYPE_ESPD_4510B           378
-#define MACH_TYPE_MP1X                 379
-#define MACH_TYPE_AT91RM9200TB         380
-#define MACH_TYPE_ADSVGX               381
-#define MACH_TYPE_OMAP_H2              382
-#define MACH_TYPE_PELEE                383
-#define MACH_TYPE_E740                 384
-#define MACH_TYPE_IQ80331              385
-#define MACH_TYPE_VERSATILE_PB         387
-#define MACH_TYPE_KEV7A400             388
-#define MACH_TYPE_LPD7A400             389
-#define MACH_TYPE_LPD7A404             390
-#define MACH_TYPE_FUJITSU_CAMELOT      391
-#define MACH_TYPE_JANUS2M              392
-#define MACH_TYPE_EMBTF                393
-#define MACH_TYPE_HPM                  394
-#define MACH_TYPE_SMDK2410TK           395
-#define MACH_TYPE_SMDK2410AJ           396
-#define MACH_TYPE_STREETRACER          397
-#define MACH_TYPE_EFRAME               398
-#define MACH_TYPE_CSB337               399
-#define MACH_TYPE_PXA_LARK             400
-#define MACH_TYPE_PNP2110              401
-#define MACH_TYPE_TCC72X               402
-#define MACH_TYPE_ALTAIR               403
-#define MACH_TYPE_KC3                  404
-#define MACH_TYPE_SINTEFTD             405
-#define MACH_TYPE_MAINSTONE            406
-#define MACH_TYPE_ADAY4X               407
-#define MACH_TYPE_LITE300              408
-#define MACH_TYPE_S5C7376              409
-#define MACH_TYPE_MT02                 410
-#define MACH_TYPE_MPORT3S              411
-#define MACH_TYPE_RA_ALPHA             412
-#define MACH_TYPE_XCEP                 413
-#define MACH_TYPE_ARCOM_VULCAN         414
-#define MACH_TYPE_STARGATE             415
-#define MACH_TYPE_ARMADILLOJ           416
-#define MACH_TYPE_ELROY_JACK           417
-#define MACH_TYPE_BACKEND              418
-#define MACH_TYPE_S5LINBOX             419
-#define MACH_TYPE_NOMADIK              420
-#define MACH_TYPE_IA_CPU_9200          421
-#define MACH_TYPE_AT91_BJA1            422
-#define MACH_TYPE_CORGI                423
-#define MACH_TYPE_POODLE               424
-#define MACH_TYPE_TEN                  425
-#define MACH_TYPE_ROVERP5P             426
-#define MACH_TYPE_SC2700               427
-#define MACH_TYPE_EX_EAGLE             428
-#define MACH_TYPE_NX_PXA12             429
-#define MACH_TYPE_NX_PXA5              430
-#define MACH_TYPE_BLACKBOARD2          431
-#define MACH_TYPE_I819                 432
-#define MACH_TYPE_IXMB995E             433
-#define MACH_TYPE_SKYRIDER             434
-#define MACH_TYPE_SKYHAWK              435
-#define MACH_TYPE_ENTERPRISE           436
-#define MACH_TYPE_DEP2410              437
-#define MACH_TYPE_ARMCORE              438
-#define MACH_TYPE_HOBBIT               439
-#define MACH_TYPE_H7210                440
-#define MACH_TYPE_PXA_NETDCU5          441
-#define MACH_TYPE_ACC                  442
-#define MACH_TYPE_ESL_SARVA            443
-#define MACH_TYPE_XM250                444
-#define MACH_TYPE_T6TC1XB              445
-#define MACH_TYPE_ESS710               446
-#define MACH_TYPE_MX31ADS              447
-#define MACH_TYPE_HIMALAYA             448
-#define MACH_TYPE_BOLFENK              449
-#define MACH_TYPE_AT91RM9200KR         450
-#define MACH_TYPE_EDB9312              451
-#define MACH_TYPE_OMAP_GENERIC         452
-#define MACH_TYPE_AXIMX3               453
-#define MACH_TYPE_EB67XDIP             454
-#define MACH_TYPE_WEBTXS               455
-#define MACH_TYPE_HAWK                 456
-#define MACH_TYPE_CCAT91SBC001         457
-#define MACH_TYPE_EXPRESSO             458
-#define MACH_TYPE_H4000                459
-#define MACH_TYPE_DINO                 460
-#define MACH_TYPE_ML675K               461
-#define MACH_TYPE_EDB9301              462
-#define MACH_TYPE_EDB9315              463
-#define MACH_TYPE_RECIVA_TT            464
-#define MACH_TYPE_CSTCB01              465
-#define MACH_TYPE_CSTCB1               466
-#define MACH_TYPE_SHADWELL             467
-#define MACH_TYPE_GOEPEL263            468
-#define MACH_TYPE_ACQ100               469
-#define MACH_TYPE_MX1FS2               470
-#define MACH_TYPE_HIPTOP_G1            471
-#define MACH_TYPE_SPARKY               472
-#define MACH_TYPE_NS9750               473
-#define MACH_TYPE_PHOENIX              474
-#define MACH_TYPE_VR1000               475
-#define MACH_TYPE_DEISTERPXA           476
-#define MACH_TYPE_BCM1160              477
-#define MACH_TYPE_PCM022               478
-#define MACH_TYPE_ADSGCX               479
-#define MACH_TYPE_DREADNAUGHT          480
-#define MACH_TYPE_DM320                481
-#define MACH_TYPE_MARKOV               482
-#define MACH_TYPE_COS7A400             483
-#define MACH_TYPE_MILANO               484
-#define MACH_TYPE_UE9328               485
-#define MACH_TYPE_UEX255               486
-#define MACH_TYPE_UE2410               487
-#define MACH_TYPE_A620                 488
-#define MACH_TYPE_OCELOT               489
-#define MACH_TYPE_CHEETAH              490
-#define MACH_TYPE_OMAP_PERSEUS2        491
-#define MACH_TYPE_ZVUE                 492
-#define MACH_TYPE_ROVERP1              493
-#define MACH_TYPE_ASIDIAL2             494
-#define MACH_TYPE_S3C24A0              495
-#define MACH_TYPE_E800                 496
-#define MACH_TYPE_E750                 497
-#define MACH_TYPE_S3C5500              498
-#define MACH_TYPE_SMDK5500             499
-#define MACH_TYPE_SIGNALSYNC           500
-#define MACH_TYPE_NBC                  501
-#define MACH_TYPE_KODIAK               502
-#define MACH_TYPE_NETBOOKPRO           503
-#define MACH_TYPE_HW90200              504
-#define MACH_TYPE_CONDOR               505
-#define MACH_TYPE_CUP                  506
-#define MACH_TYPE_KITE                 507
-#define MACH_TYPE_SCB9328              508
-#define MACH_TYPE_OMAP_H3              509
-#define MACH_TYPE_OMAP_H4              510
-#define MACH_TYPE_N10                  511
-#define MACH_TYPE_MONTAJADE            512
-#define MACH_TYPE_SG560                513
-#define MACH_TYPE_DP1000               514
-#define MACH_TYPE_OMAP_OSK             515
-#define MACH_TYPE_RG100V3              516
-#define MACH_TYPE_MX2ADS               517
-#define MACH_TYPE_PXA_KILO             518
-#define MACH_TYPE_IXP4XX_EAGLE         519
-#define MACH_TYPE_TOSA                 520
-#define MACH_TYPE_MB2520F              521
-#define MACH_TYPE_EMC1000              522
-#define MACH_TYPE_TIDSC25              523
-#define MACH_TYPE_AKCPMXL              524
-#define MACH_TYPE_AV3XX                525
-#define MACH_TYPE_AVILA                526
-#define MACH_TYPE_PXA_MPM10            527
-#define MACH_TYPE_PXA_KYANITE          528
-#define MACH_TYPE_SGOLD                529
-#define MACH_TYPE_OSCAR                530
-#define MACH_TYPE_EPXA4USB2            531
-#define MACH_TYPE_XSENGINE             532
-#define MACH_TYPE_IP600                533
-#define MACH_TYPE_MCAN2                534
-#define MACH_TYPE_DDI_BLUERIDGE        535
-#define MACH_TYPE_SKYMINDER            536
-#define MACH_TYPE_LPD79520             537
-#define MACH_TYPE_EDB9302              538
-#define MACH_TYPE_HW90340              539
-#define MACH_TYPE_CIP_BOX              540
-#define MACH_TYPE_IVPN                 541
-#define MACH_TYPE_RSOC2                542
-#define MACH_TYPE_HUSKY                543
-#define MACH_TYPE_BOXER                544
-#define MACH_TYPE_SHEPHERD             545
-#define MACH_TYPE_AML42800AA           546
-#define MACH_TYPE_LPC2294              548
-#define MACH_TYPE_SWITCHGRASS          549
-#define MACH_TYPE_ENS_CMU              550
-#define MACH_TYPE_MM6_SDB              551
-#define MACH_TYPE_SATURN               552
-#define MACH_TYPE_I30030EVB            553
-#define MACH_TYPE_MXC27530EVB          554
-#define MACH_TYPE_SMDK2800             555
-#define MACH_TYPE_MTWILSON             556
-#define MACH_TYPE_ZITI                 557
-#define MACH_TYPE_GRANDFATHER          558
-#define MACH_TYPE_TENGINE              559
-#define MACH_TYPE_S3C2460              560
-#define MACH_TYPE_PDM                  561
-#define MACH_TYPE_H4700                562
-#define MACH_TYPE_H6300                563
-#define MACH_TYPE_RZ1700               564
-#define MACH_TYPE_A716                 565
-#define MACH_TYPE_ESTK2440A            566
-#define MACH_TYPE_ATWIXP425            567
-#define MACH_TYPE_CSB336               568
-#define MACH_TYPE_RIRM2                569
-#define MACH_TYPE_CX23518              570
-#define MACH_TYPE_CX2351X              571
-#define MACH_TYPE_COMPUTIME            572
-#define MACH_TYPE_IZARUS               573
-#define MACH_TYPE_RTS                  574
-#define MACH_TYPE_SE5100               575
-#define MACH_TYPE_S3C2510              576
-#define MACH_TYPE_CSB437TL             577
-#define MACH_TYPE_SLAUSON              578
-#define MACH_TYPE_PEARLRIVER           579
-#define MACH_TYPE_TDC_P210             580
-#define MACH_TYPE_SG580                581
-#define MACH_TYPE_WRSBCARM7            582
-#define MACH_TYPE_IPD                  583
-#define MACH_TYPE_PXA_DNP2110          584
-#define MACH_TYPE_XAENIAX              585
-#define MACH_TYPE_SOMN4250             586
-#define MACH_TYPE_PLEB2                587
-#define MACH_TYPE_CORNWALLIS           588
-#define MACH_TYPE_GURNEY_DRV           589
-#define MACH_TYPE_CHAFFEE              590
-#define MACH_TYPE_RMS101               591
-#define MACH_TYPE_RX3715               592
-#define MACH_TYPE_SWIFT                593
-#define MACH_TYPE_ROVERP7              594
-#define MACH_TYPE_PR818S               595
-#define MACH_TYPE_TRXPRO               596
-#define MACH_TYPE_NSLU2                597
-#define MACH_TYPE_E400                 598
-#define MACH_TYPE_TRAB                 599
-#define MACH_TYPE_CMC_PU2              600
-#define MACH_TYPE_FULCRUM              601
-#define MACH_TYPE_NETGATE42X           602
-#define MACH_TYPE_STR710               603
-#define MACH_TYPE_IXDPG425             604
-#define MACH_TYPE_TOMTOMGO             605
-#define MACH_TYPE_VERSATILE_AB         606
-#define MACH_TYPE_EDB9307              607
-#define MACH_TYPE_SG565                608
-#define MACH_TYPE_LPD79524             609
-#define MACH_TYPE_LPD79525             610
-#define MACH_TYPE_RMS100               611
-#define MACH_TYPE_KB9200               612
-#define MACH_TYPE_SX1                  613
-#define MACH_TYPE_HMS39C7092           614
-#define MACH_TYPE_ARMADILLO            615
-#define MACH_TYPE_IPCU                 616
-#define MACH_TYPE_LOOX720              617
-#define MACH_TYPE_IXDP465              618
-#define MACH_TYPE_IXDP2351             619
-#define MACH_TYPE_ADSVIX               620
-#define MACH_TYPE_DM270                621
-#define MACH_TYPE_SOCLTPLUS            622
-#define MACH_TYPE_ECIA                 623
-#define MACH_TYPE_CM4008               624
-#define MACH_TYPE_P2001                625
-#define MACH_TYPE_TWISTER              626
-#define MACH_TYPE_MUDSHARK             627
-#define MACH_TYPE_HB2                  628
-#define MACH_TYPE_IQ80332              629
-#define MACH_TYPE_SENDT                630
-#define MACH_TYPE_MX2JAZZ              631
-#define MACH_TYPE_MULTIIO              632
-#define MACH_TYPE_HRDISPLAY            633
-#define MACH_TYPE_MXC27530ADS          634
-#define MACH_TYPE_TRIZEPS3             635
-#define MACH_TYPE_ZEFEERDZA            636
-#define MACH_TYPE_ZEFEERDZB            637
-#define MACH_TYPE_ZEFEERDZG            638
-#define MACH_TYPE_ZEFEERDZN            639
-#define MACH_TYPE_ZEFEERDZQ            640
-#define MACH_TYPE_GTWX5715             641
-#define MACH_TYPE_ASTRO_JACK           643
-#define MACH_TYPE_TIP03                644
-#define MACH_TYPE_A9200EC              645
-#define MACH_TYPE_PNX0105              646
-#define MACH_TYPE_ADCPOECPU            647
-#define MACH_TYPE_CSB637               648
-#define MACH_TYPE_MB9200               650
-#define MACH_TYPE_KULUN                651
-#define MACH_TYPE_SNAPPER              652
-#define MACH_TYPE_OPTIMA               653
-#define MACH_TYPE_DLHSBC               654
-#define MACH_TYPE_X30                  655
-#define MACH_TYPE_N30                  656
-#define MACH_TYPE_MANGA_KS8695         657
-#define MACH_TYPE_AJAX                 658
-#define MACH_TYPE_NEC_MP900            659
-#define MACH_TYPE_VVTK1000             661
-#define MACH_TYPE_KAFA                 662
-#define MACH_TYPE_VVTK3000             663
-#define MACH_TYPE_PIMX1                664
-#define MACH_TYPE_OLLIE                665
-#define MACH_TYPE_SKYMAX               666
-#define MACH_TYPE_JAZZ                 667
-#define MACH_TYPE_TEL_T3               668
-#define MACH_TYPE_AISINO_FCR255        669
-#define MACH_TYPE_BTWEB                670
-#define MACH_TYPE_DBG_LH79520          671
-#define MACH_TYPE_CM41XX               672
-#define MACH_TYPE_TS72XX               673
-#define MACH_TYPE_NGGPXA               674
-#define MACH_TYPE_CSB535               675
-#define MACH_TYPE_CSB536               676
-#define MACH_TYPE_PXA_TRAKPOD          677
-#define MACH_TYPE_PRAXIS               678
-#define MACH_TYPE_LH75411              679
-#define MACH_TYPE_OTOM                 680
-#define MACH_TYPE_NEXCODER_2440        681
-#define MACH_TYPE_LOOX410              682
-#define MACH_TYPE_WESTLAKE             683
-#define MACH_TYPE_NSB                  684
-#define MACH_TYPE_ESL_SARVA_STN        685
-#define MACH_TYPE_ESL_SARVA_TFT        686
-#define MACH_TYPE_ESL_SARVA_IAD        687
-#define MACH_TYPE_ESL_SARVA_ACC        688
-#define MACH_TYPE_TYPHOON              689
-#define MACH_TYPE_CNAV                 690
-#define MACH_TYPE_A730                 691
-#define MACH_TYPE_NETSTAR              692
-#define MACH_TYPE_PHASEFALE_SUPERCON   693
-#define MACH_TYPE_SHIVA1100            694
-#define MACH_TYPE_ETEXSC               695
-#define MACH_TYPE_IXDPG465             696
-#define MACH_TYPE_A9M2410              697
-#define MACH_TYPE_A9M2440              698
-#define MACH_TYPE_A9M9750              699
-#define MACH_TYPE_A9M9360              700
-#define MACH_TYPE_UNC90                701
-#define MACH_TYPE_ECO920               702
-#define MACH_TYPE_SATVIEW              703
-#define MACH_TYPE_ROADRUNNER           704
-#define MACH_TYPE_AT91RM9200EK         705
-#define MACH_TYPE_GP32                 706
-#define MACH_TYPE_GEM                  707
-#define MACH_TYPE_I858                 708
-#define MACH_TYPE_HX2750               709
-#define MACH_TYPE_MXC91131EVB          710
-#define MACH_TYPE_P700                 711
-#define MACH_TYPE_CPE                  712
-#define MACH_TYPE_SPITZ                713
-#define MACH_TYPE_NIMBRA340            714
-#define MACH_TYPE_LPC22XX              715
-#define MACH_TYPE_COMET3               716
-#define MACH_TYPE_COMET4               717
-#define MACH_TYPE_CSB625               718
-#define MACH_TYPE_FORTUNET2            719
-#define MACH_TYPE_S5H2200              720
-#define MACH_TYPE_OPTORM920            721
-#define MACH_TYPE_ADSBITSYXB           722
-#define MACH_TYPE_ADSSPHERE            723
-#define MACH_TYPE_ADSPORTAL            724
-#define MACH_TYPE_LN2410SBC            725
-#define MACH_TYPE_CB3RUFC              726
-#define MACH_TYPE_MP2USB               727
-#define MACH_TYPE_NTNP425C             728
-#define MACH_TYPE_COLIBRI              729
-#define MACH_TYPE_PCM7220              730
-#define MACH_TYPE_GATEWAY7001          731
-#define MACH_TYPE_PCM027               732
-#define MACH_TYPE_CMPXA                733
-#define MACH_TYPE_ANUBIS               734
-#define MACH_TYPE_ITE8152              735
-#define MACH_TYPE_LPC3XXX              736
-#define MACH_TYPE_PUPPETEER            737
-#define MACH_TYPE_E570                 739
-#define MACH_TYPE_X50                  740
-#define MACH_TYPE_RECON                741
-#define MACH_TYPE_XBOARDGP8            742
-#define MACH_TYPE_FPIC2                743
-#define MACH_TYPE_AKITA                744
-#define MACH_TYPE_A81                  745
-#define MACH_TYPE_SVM_SC25X            746
-#define MACH_TYPE_VADATECH020          747
-#define MACH_TYPE_TLI                  748
-#define MACH_TYPE_EDB9315LC            749
-#define MACH_TYPE_PASSEC               750
-#define MACH_TYPE_DS_TIGER             751
-#define MACH_TYPE_E310                 752
-#define MACH_TYPE_E330                 753
-#define MACH_TYPE_RT3000               754
-#define MACH_TYPE_NOKIA770             755
-#define MACH_TYPE_PNX0106              756
-#define MACH_TYPE_HX21XX               757
-#define MACH_TYPE_FARADAY              758
-#define MACH_TYPE_SBC9312              759
-#define MACH_TYPE_BATMAN               760
-#define MACH_TYPE_JPD201               761
-#define MACH_TYPE_MIPSA                762
-#define MACH_TYPE_KACOM                763
-#define MACH_TYPE_SWARCOCPU            764
-#define MACH_TYPE_SWARCODSL            765
-#define MACH_TYPE_BLUEANGEL            766
-#define MACH_TYPE_HAIRYGRAMA           767
-#define MACH_TYPE_BANFF                768
-#define MACH_TYPE_CARMEVA              769
-#define MACH_TYPE_SAM255               770
-#define MACH_TYPE_PPM10                771
-#define MACH_TYPE_EDB9315A             772
-#define MACH_TYPE_SUNSET               773
-#define MACH_TYPE_STARGATE2            774
-#define MACH_TYPE_INTELMOTE2           775
-#define MACH_TYPE_TRIZEPS4             776
-#define MACH_TYPE_MAINSTONE2           777
-#define MACH_TYPE_EZ_IXP42X            778
-#define MACH_TYPE_TAPWAVE_ZODIAC       779
-#define MACH_TYPE_UNIVERSALMETER       780
-#define MACH_TYPE_HICOARM9             781
-#define MACH_TYPE_PNX4008              782
-#define MACH_TYPE_KWS6000              783
-#define MACH_TYPE_PORTUX920T           784
-#define MACH_TYPE_EZ_X5                785
-#define MACH_TYPE_OMAP_RUDOLPH         786
-#define MACH_TYPE_CPUAT91              787
-#define MACH_TYPE_REA9200              788
-#define MACH_TYPE_ACTS_PUNE_SA1110     789
-#define MACH_TYPE_IXP425               790
-#define MACH_TYPE_I30030ADS            791
-#define MACH_TYPE_PERCH                792
-#define MACH_TYPE_EIS05R1              793
-#define MACH_TYPE_PEPPERPAD            794
-#define MACH_TYPE_SB3010               795
-#define MACH_TYPE_RM9200               796
-#define MACH_TYPE_DMA03                797
-#define MACH_TYPE_ROAD_S101            798
-#define MACH_TYPE_IQ81340SC            799
-#define MACH_TYPE_IQ_NEXTGEN_B         800
-#define MACH_TYPE_IQ81340MC            801
-#define MACH_TYPE_IQ_NEXTGEN_D         802
-#define MACH_TYPE_IQ_NEXTGEN_E         803
-#define MACH_TYPE_MALLOW_AT91          804
-#define MACH_TYPE_CYBERTRACKER_I       805
-#define MACH_TYPE_GESBC931X            806
-#define MACH_TYPE_CENTIPAD             807
-#define MACH_TYPE_ARMSOC               808
-#define MACH_TYPE_SE4200               809
-#define MACH_TYPE_EMS197A              810
-#define MACH_TYPE_MICRO9               811
-#define MACH_TYPE_MICRO9L              812
-#define MACH_TYPE_UC5471DSP            813
-#define MACH_TYPE_SJ5471ENG            814
-#define MACH_TYPE_CMPXA26X             815
-#define MACH_TYPE_NC                   816
-#define MACH_TYPE_OMAP_PALMTE          817
-#define MACH_TYPE_AJAX52X              818
-#define MACH_TYPE_SIRIUSTAR            819
-#define MACH_TYPE_IODATA_HDLG          820
-#define MACH_TYPE_AT91RM9200UTL        821
-#define MACH_TYPE_BIOSAFE              822
-#define MACH_TYPE_MP1000               823
-#define MACH_TYPE_PARSY                824
-#define MACH_TYPE_CCXP                 825
-#define MACH_TYPE_OMAP_GSAMPLE         826
-#define MACH_TYPE_REALVIEW_EB          827
-#define MACH_TYPE_SAMOA                828
-#define MACH_TYPE_PALMT3               829
-#define MACH_TYPE_I878                 830
-#define MACH_TYPE_BORZOI               831
-#define MACH_TYPE_GECKO                832
-#define MACH_TYPE_DS101                833
-#define MACH_TYPE_OMAP_PALMTT2         834
-#define MACH_TYPE_PALMLD               835
-#define MACH_TYPE_CC9C                 836
-#define MACH_TYPE_SBC1670              837
-#define MACH_TYPE_IXDP28X5             838
-#define MACH_TYPE_OMAP_PALMTT          839
-#define MACH_TYPE_ML696K               840
-#define MACH_TYPE_ARCOM_ZEUS           841
-#define MACH_TYPE_OSIRIS               842
-#define MACH_TYPE_MAESTRO              843
-#define MACH_TYPE_PALMTE2              844
-#define MACH_TYPE_IXBBM                845
-#define MACH_TYPE_MX27ADS              846
-#define MACH_TYPE_AX8004               847
-#define MACH_TYPE_AT91SAM9261EK        848
-#define MACH_TYPE_LOFT                 849
-#define MACH_TYPE_MAGPIE               850
-#define MACH_TYPE_MX21ADS              851
-#define MACH_TYPE_MB87M3400            852
-#define MACH_TYPE_MGUARD_DELTA         853
-#define MACH_TYPE_DAVINCI_DVDP         854
-#define MACH_TYPE_HTCUNIVERSAL         855
-#define MACH_TYPE_TPAD                 856
-#define MACH_TYPE_ROVERP3              857
-#define MACH_TYPE_JORNADA928           858
-#define MACH_TYPE_MV88FXX81            859
-#define MACH_TYPE_STMP36XX             860
-#define MACH_TYPE_SXNI79524            861
-#define MACH_TYPE_AMS_DELTA            862
-#define MACH_TYPE_URANIUM              863
-#define MACH_TYPE_UCON                 864
-#define MACH_TYPE_NAS100D              865
-#define MACH_TYPE_L083_1000            866
-#define MACH_TYPE_EZX                  867
-#define MACH_TYPE_PNX5220              868
-#define MACH_TYPE_BUTTE                869
-#define MACH_TYPE_SRM2                 870
-#define MACH_TYPE_DSBR                 871
-#define MACH_TYPE_CRYSTALBALL          872
-#define MACH_TYPE_TINYPXA27X           873
-#define MACH_TYPE_HERBIE               874
-#define MACH_TYPE_MAGICIAN             875
-#define MACH_TYPE_CM4002               876
-#define MACH_TYPE_B4                   877
-#define MACH_TYPE_MAUI                 878
-#define MACH_TYPE_CYBERTRACKER_G       879
-#define MACH_TYPE_NXDKN                880
-#define MACH_TYPE_MIO8390              881
-#define MACH_TYPE_OMI_BOARD            882
-#define MACH_TYPE_MX21CIV              883
-#define MACH_TYPE_MAHI_CDAC            884
-#define MACH_TYPE_PALMTX               885
-#define MACH_TYPE_S3C2413              887
-#define MACH_TYPE_SAMSYS_EP0           888
-#define MACH_TYPE_WG302V1              889
-#define MACH_TYPE_WG302V2              890
-#define MACH_TYPE_EB42X                891
-#define MACH_TYPE_IQ331ES              892
-#define MACH_TYPE_COSYDSP              893
-#define MACH_TYPE_UPLAT7D              894
-#define MACH_TYPE_PTDAVINCI            895
-#define MACH_TYPE_MBUS                 896
-#define MACH_TYPE_NADIA2VB             897
-#define MACH_TYPE_R1000                898
-#define MACH_TYPE_HW90250              899
-#define MACH_TYPE_OMAP_2430SDP         900
-#define MACH_TYPE_DAVINCI_EVM          901
-#define MACH_TYPE_OMAP_TORNADO         902
-#define MACH_TYPE_OLOCREEK             903
-#define MACH_TYPE_PALMZ72              904
-#define MACH_TYPE_NXDB500              905
-#define MACH_TYPE_APF9328              906
-#define MACH_TYPE_OMAP_WIPOQ           907
-#define MACH_TYPE_OMAP_TWIP            908
-#define MACH_TYPE_TREO650              909
-#define MACH_TYPE_ACUMEN               910
-#define MACH_TYPE_XP100                911
-#define MACH_TYPE_FS2410               912
-#define MACH_TYPE_PXA270_CERF          913
-#define MACH_TYPE_SQ2FTLPALM           914
-#define MACH_TYPE_BSEMSERVER           915
-#define MACH_TYPE_NETCLIENT            916
-#define MACH_TYPE_PALMT5               917
-#define MACH_TYPE_PALMTC               918
-#define MACH_TYPE_OMAP_APOLLON         919
-#define MACH_TYPE_MXC30030EVB          920
-#define MACH_TYPE_REA_2D               921
-#define MACH_TYPE_TI3E524              922
-#define MACH_TYPE_ATEB9200             923
-#define MACH_TYPE_AUCKLAND             924
-#define MACH_TYPE_AK3320M              925
-#define MACH_TYPE_DURAMAX              926
-#define MACH_TYPE_N35                  927
-#define MACH_TYPE_PRONGHORN            928
-#define MACH_TYPE_FUNDY                929
-#define MACH_TYPE_LOGICPD_PXA270       930
-#define MACH_TYPE_CPU777               931
-#define MACH_TYPE_SIMICON9201          932
-#define MACH_TYPE_LEAP2_HPM            933
-#define MACH_TYPE_CM922TXA10           934
-#define MACH_TYPE_PXA                  935
-#define MACH_TYPE_SANDGATE2            936
-#define MACH_TYPE_SANDGATE2G           937
-#define MACH_TYPE_SANDGATE2P           938
-#define MACH_TYPE_FRED_JACK            939
-#define MACH_TYPE_TTG_COLOR1           940
-#define MACH_TYPE_NXEB500HMI           941
-#define MACH_TYPE_NETDCU8              942
-#define MACH_TYPE_NG_FVX538            944
-#define MACH_TYPE_NG_FVS338            945
-#define MACH_TYPE_PNX4103              946
-#define MACH_TYPE_HESDB                947
-#define MACH_TYPE_XSILO                948
-#define MACH_TYPE_ESPRESSO             949
-#define MACH_TYPE_EMLC                 950
-#define MACH_TYPE_SISTERON             951
-#define MACH_TYPE_RX1950               952
-#define MACH_TYPE_TSC_VENUS            953
-#define MACH_TYPE_DS101J               954
-#define MACH_TYPE_MXC30030ADS          955
-#define MACH_TYPE_FUJITSU_WIMAXSOC     956
-#define MACH_TYPE_DUALPCMODEM          957
-#define MACH_TYPE_GESBC9312            958
-#define MACH_TYPE_HTCAPACHE            959
-#define MACH_TYPE_IXDP435              960
-#define MACH_TYPE_CATPROVT100          961
-#define MACH_TYPE_PICOTUX1XX           962
-#define MACH_TYPE_PICOTUX2XX           963
-#define MACH_TYPE_DSMG600              964
-#define MACH_TYPE_EMPC2                965
-#define MACH_TYPE_VENTURA              966
-#define MACH_TYPE_PHIDGET_SBC          967
-#define MACH_TYPE_IJ3K                 968
-#define MACH_TYPE_PISGAH               969
-#define MACH_TYPE_OMAP_FSAMPLE         970
-#define MACH_TYPE_SG720                971
-#define MACH_TYPE_REDFOX               972
-#define MACH_TYPE_MYSH_EP9315_1        973
-#define MACH_TYPE_TPF106               974
-#define MACH_TYPE_AT91RM9200KG         975
-#define MACH_TYPE_SLEDB                976
-#define MACH_TYPE_ONTRACK              977
-#define MACH_TYPE_PM1200               978
-#define MACH_TYPE_ESS24XXX             979
-#define MACH_TYPE_COREMP7              980
-#define MACH_TYPE_NEXCODER_6446        981
-#define MACH_TYPE_STVC8380             982
-#define MACH_TYPE_TEKLYNX              983
-#define MACH_TYPE_CARBONADO            984
-#define MACH_TYPE_SYSMOS_MP730         985
-#define MACH_TYPE_SNAPPER_CL15         986
-#define MACH_TYPE_PGIGIM               987
-#define MACH_TYPE_PTX9160P2            988
-#define MACH_TYPE_DCORE1               989
-#define MACH_TYPE_VICTORPXA            990
-#define MACH_TYPE_MX2DTB               991
-#define MACH_TYPE_PXA_IREX_ER0100      992
-#define MACH_TYPE_OMAP_PALMZ71         993
-#define MACH_TYPE_BARTEC_DEG           994
-#define MACH_TYPE_HW50251              995
-#define MACH_TYPE_IBOX                 996
-#define MACH_TYPE_ATLASLH7A404         997
-#define MACH_TYPE_PT2026               998
-#define MACH_TYPE_HTCALPINE            999
-#define MACH_TYPE_BARTEC_VTU           1000
-#define MACH_TYPE_VCOREII              1001
-#define MACH_TYPE_PDNB3                1002
-#define MACH_TYPE_HTCBEETLES           1003
-#define MACH_TYPE_S3C6400              1004
-#define MACH_TYPE_S3C2443              1005
-#define MACH_TYPE_OMAP_LDK             1006
-#define MACH_TYPE_SMDK2460             1007
-#define MACH_TYPE_SMDK2440             1008
-#define MACH_TYPE_SMDK2412             1009
-#define MACH_TYPE_WEBBOX               1010
-#define MACH_TYPE_CWWNDP               1011
-#define MACH_TYPE_DRAGON               1012
-#define MACH_TYPE_OPENDO_CPU_BOARD     1013
-#define MACH_TYPE_CCM2200              1014
-#define MACH_TYPE_ETWARM               1015
-#define MACH_TYPE_M93030               1016
-#define MACH_TYPE_CC7U                 1017
-#define MACH_TYPE_MTT_RANGER           1018
-#define MACH_TYPE_NEXUS                1019
-#define MACH_TYPE_DESMAN               1020
-#define MACH_TYPE_BKDE303              1021
-#define MACH_TYPE_SMDK2413             1022
-#define MACH_TYPE_AML_M7200            1023
-#define MACH_TYPE_AML_M5900            1024
-#define MACH_TYPE_SG640                1025
-#define MACH_TYPE_EDG79524             1026
-#define MACH_TYPE_AI2410               1027
-#define MACH_TYPE_IXP465               1028
-#define MACH_TYPE_BALLOON3             1029
-#define MACH_TYPE_HEINS                1030
-#define MACH_TYPE_MPLUSEVA             1031
-#define MACH_TYPE_RT042                1032
-#define MACH_TYPE_CWIEM                1033
-#define MACH_TYPE_CM_X270              1034
-#define MACH_TYPE_CM_X255              1035
-#define MACH_TYPE_ESH_AT91             1036
-#define MACH_TYPE_SANDGATE3            1037
-#define MACH_TYPE_PRIMO                1038
-#define MACH_TYPE_GEMSTONE             1039
-#define MACH_TYPE_PRONGHORNMETRO       1040
-#define MACH_TYPE_SIDEWINDER           1041
-#define MACH_TYPE_PICOMOD1             1042
-#define MACH_TYPE_SG590                1043
-#define MACH_TYPE_AKAI9307             1044
-#define MACH_TYPE_FONTAINE             1045
-#define MACH_TYPE_WOMBAT               1046
-#define MACH_TYPE_ACQ300               1047
-#define MACH_TYPE_MOD_270              1048
-#define MACH_TYPE_VC0820               1049
-#define MACH_TYPE_ANI_AIM              1050
-#define MACH_TYPE_JELLYFISH            1051
-#define MACH_TYPE_AMANITA              1052
-#define MACH_TYPE_VLINK                1053
-#define MACH_TYPE_DEXFLEX              1054
-#define MACH_TYPE_EIGEN_TTQ            1055
-#define MACH_TYPE_ARCOM_TITAN          1056
-#define MACH_TYPE_TABLA                1057
-#define MACH_TYPE_MDIRAC3              1058
-#define MACH_TYPE_MRHFBP2              1059
-#define MACH_TYPE_AT91RM9200RB         1060
-#define MACH_TYPE_ANI_APM              1061
-#define MACH_TYPE_ELLA1                1062
-#define MACH_TYPE_INHAND_PXA27X        1063
-#define MACH_TYPE_INHAND_PXA25X        1064
-#define MACH_TYPE_EMPOS_XM             1065
-#define MACH_TYPE_EMPOS                1066
-#define MACH_TYPE_EMPOS_TINY           1067
-#define MACH_TYPE_EMPOS_SM             1068
-#define MACH_TYPE_EGRET                1069
-#define MACH_TYPE_OSTRICH              1070
-#define MACH_TYPE_N50                  1071
-#define MACH_TYPE_ECBAT91              1072
-#define MACH_TYPE_STAREAST             1073
-#define MACH_TYPE_DSPG_DW              1074
-#define MACH_TYPE_ONEARM               1075
-#define MACH_TYPE_MRG110_6             1076
-#define MACH_TYPE_WRT300NV2            1077
-#define MACH_TYPE_XM_BULVERDE          1078
-#define MACH_TYPE_MSM6100              1079
-#define MACH_TYPE_ETI_B1               1080
-#define MACH_TYPE_ZILOG_ZA9L           1081
-#define MACH_TYPE_BIT2440              1082
-#define MACH_TYPE_NBI                  1083
-#define MACH_TYPE_SMDK2443             1084
-#define MACH_TYPE_VDAVINCI             1085
-#define MACH_TYPE_ATC6                 1086
-#define MACH_TYPE_MULTMDW              1087
-#define MACH_TYPE_MBA2440              1088
-#define MACH_TYPE_ECSD                 1089
-#define MACH_TYPE_PALMZ31              1090
-#define MACH_TYPE_FSG                  1091
-#define MACH_TYPE_RAZOR101             1092
-#define MACH_TYPE_OPERA_TDM            1093
-#define MACH_TYPE_COMCERTO             1094
-#define MACH_TYPE_TB0319               1095
-#define MACH_TYPE_KWS8000              1096
-#define MACH_TYPE_B2                   1097
-#define MACH_TYPE_LCL54                1098
-#define MACH_TYPE_AT91SAM9260EK        1099
-#define MACH_TYPE_GLANTANK             1100
-#define MACH_TYPE_N2100                1101
-#define MACH_TYPE_N4100                1102
-#define MACH_TYPE_VERTICAL_RSC4        1103
-#define MACH_TYPE_SG8100               1104
-#define MACH_TYPE_IM42XX               1105
-#define MACH_TYPE_FTXX                 1106
-#define MACH_TYPE_LWFUSION             1107
-#define MACH_TYPE_QT2410               1108
-#define MACH_TYPE_KIXRP435             1109
-#define MACH_TYPE_CCW9C                1110
-#define MACH_TYPE_DABHS                1111
-#define MACH_TYPE_GZMX                 1112
-#define MACH_TYPE_IPNW100AP            1113
-#define MACH_TYPE_CC9P9360DEV          1114
-#define MACH_TYPE_CC9P9750DEV          1115
-#define MACH_TYPE_CC9P9360VAL          1116
-#define MACH_TYPE_CC9P9750VAL          1117
-#define MACH_TYPE_NX70V                1118
-#define MACH_TYPE_AT91RM9200DF         1119
-#define MACH_TYPE_SE_PILOT2            1120
-#define MACH_TYPE_MTCN_T800            1121
-#define MACH_TYPE_VCMX212              1122
-#define MACH_TYPE_LYNX                 1123
-#define MACH_TYPE_AT91SAM9260ID        1124
-#define MACH_TYPE_HW86052              1125
-#define MACH_TYPE_PILZ_PMI3            1126
-#define MACH_TYPE_EDB9302A             1127
-#define MACH_TYPE_EDB9307A             1128
-#define MACH_TYPE_CT_DFS               1129
-#define MACH_TYPE_PILZ_PMI4            1130
-#define MACH_TYPE_XCEEDNP_IXP          1131
-#define MACH_TYPE_SMDK2442B            1132
-#define MACH_TYPE_XNODE                1133
-#define MACH_TYPE_AIDX270              1134
-#define MACH_TYPE_REMA                 1135
-#define MACH_TYPE_BPS1000              1136
-#define MACH_TYPE_HW90350              1137
-#define MACH_TYPE_OMAP_3430SDP         1138
-#define MACH_TYPE_BLUETOUCH            1139
-#define MACH_TYPE_VSTMS                1140
-#define MACH_TYPE_XSBASE270            1141
-#define MACH_TYPE_AT91SAM9260EK_CN     1142
-#define MACH_TYPE_ADSTURBOXB           1143
-#define MACH_TYPE_OTI4110              1144
-#define MACH_TYPE_HME_PXA              1145
-#define MACH_TYPE_DEISTERDCA           1146
-#define MACH_TYPE_CES_SSEM2            1147
-#define MACH_TYPE_CES_MTR              1148
-#define MACH_TYPE_TDS_AVNG_SBC         1149
-#define MACH_TYPE_EVEREST              1150
-#define MACH_TYPE_PNX4010              1151
-#define MACH_TYPE_OXNAS                1152
-#define MACH_TYPE_FIORI                1153
-#define MACH_TYPE_ML1200               1154
-#define MACH_TYPE_PECOS                1155
-#define MACH_TYPE_NB2XXX               1156
-#define MACH_TYPE_HW6900               1157
-#define MACH_TYPE_CDCS_QUOLL           1158
-#define MACH_TYPE_QUICKSILVER          1159
-#define MACH_TYPE_UPLAT926             1160
-#define MACH_TYPE_DEP2410_THOMAS       1161
-#define MACH_TYPE_DTK2410              1162
-#define MACH_TYPE_CHILI                1163
-#define MACH_TYPE_DEMETER              1164
-#define MACH_TYPE_DIONYSUS             1165
-#define MACH_TYPE_AS352X               1166
-#define MACH_TYPE_SERVICE              1167
-#define MACH_TYPE_CS_E9301             1168
-#define MACH_TYPE_MICRO9M              1169
-#define MACH_TYPE_IA_MOSPCK            1170
-#define MACH_TYPE_QL201B               1171
-#define MACH_TYPE_BBM                  1174
-#define MACH_TYPE_EXXX                 1175
-#define MACH_TYPE_WMA11B               1176
-#define MACH_TYPE_PELCO_ATLAS          1177
-#define MACH_TYPE_G500                 1178
-#define MACH_TYPE_BUG                  1179
-#define MACH_TYPE_MX33ADS              1180
-#define MACH_TYPE_CHUB                 1181
-#define MACH_TYPE_NEO1973_GTA01        1182
-#define MACH_TYPE_W90N740              1183
-#define MACH_TYPE_MEDALLION_SA2410     1184
-#define MACH_TYPE_IA_CPU_9200_2        1185
-#define MACH_TYPE_DIMMRM9200           1186
-#define MACH_TYPE_PM9261               1187
-#define MACH_TYPE_ML7304               1189
-#define MACH_TYPE_UCP250               1190
-#define MACH_TYPE_INTBOARD             1191
-#define MACH_TYPE_GULFSTREAM           1192
-#define MACH_TYPE_LABQUEST             1193
-#define MACH_TYPE_VCMX313              1194
-#define MACH_TYPE_URG200               1195
-#define MACH_TYPE_CPUX255LCDNET        1196
-#define MACH_TYPE_NETDCU9              1197
-#define MACH_TYPE_NETDCU10             1198
-#define MACH_TYPE_DSPG_DGA             1199
-#define MACH_TYPE_DSPG_DVW             1200
-#define MACH_TYPE_SOLOS                1201
-#define MACH_TYPE_AT91SAM9263EK        1202
-#define MACH_TYPE_OSSTBOX              1203
-#define MACH_TYPE_KBAT9261             1204
-#define MACH_TYPE_CT1100               1205
-#define MACH_TYPE_AKCPPXA              1206
-#define MACH_TYPE_OCHAYA1020           1207
-#define MACH_TYPE_HITRACK              1208
-#define MACH_TYPE_SYME1                1209
-#define MACH_TYPE_SYHL1                1210
-#define MACH_TYPE_EMPCA400             1211
-#define MACH_TYPE_EM7210               1212
-#define MACH_TYPE_HTCHERMES            1213
-#define MACH_TYPE_ETI_C1               1214
-#define MACH_TYPE_AC100                1216
-#define MACH_TYPE_SNEETCH              1217
-#define MACH_TYPE_STUDENTMATE          1218
-#define MACH_TYPE_ZIR2410              1219
-#define MACH_TYPE_ZIR2413              1220
-#define MACH_TYPE_DLONIP3              1221
-#define MACH_TYPE_INSTREAM             1222
-#define MACH_TYPE_AMBARELLA            1223
-#define MACH_TYPE_NEVIS                1224
-#define MACH_TYPE_HTC_TRINITY          1225
-#define MACH_TYPE_QL202B               1226
-#define MACH_TYPE_VPAC270              1227
-#define MACH_TYPE_RD129                1228
-#define MACH_TYPE_HTCWIZARD            1229
-#define MACH_TYPE_TREO680              1230
-#define MACH_TYPE_TECON_TMEZON         1231
-#define MACH_TYPE_ZYLONITE             1233
-#define MACH_TYPE_GENE1270             1234
-#define MACH_TYPE_ZIR2412              1235
-#define MACH_TYPE_MX31LITE             1236
-#define MACH_TYPE_T700WX               1237
-#define MACH_TYPE_VF100                1238
-#define MACH_TYPE_NSB2                 1239
-#define MACH_TYPE_NXHMI_BB             1240
-#define MACH_TYPE_NXHMI_RE             1241
-#define MACH_TYPE_N4100PRO             1242
-#define MACH_TYPE_SAM9260              1243
-#define MACH_TYPE_OMAP_TREO600         1244
-#define MACH_TYPE_INDY2410             1245
-#define MACH_TYPE_NELT_A               1246
-#define MACH_TYPE_N311                 1248
-#define MACH_TYPE_AT91SAM9260VGK       1249
-#define MACH_TYPE_AT91LEPPE            1250
-#define MACH_TYPE_AT91LEPCCN           1251
-#define MACH_TYPE_APC7100              1252
-#define MACH_TYPE_STARGAZER            1253
-#define MACH_TYPE_SONATA               1254
-#define MACH_TYPE_SCHMOOGIE            1255
-#define MACH_TYPE_AZTOOL               1256
-#define MACH_TYPE_MIOA701              1257
-#define MACH_TYPE_SXNI9260             1258
-#define MACH_TYPE_MXC27520EVB          1259
-#define MACH_TYPE_ARMADILLO5X0         1260
-#define MACH_TYPE_MB9260               1261
-#define MACH_TYPE_MB9263               1262
-#define MACH_TYPE_IPAC9302             1263
-#define MACH_TYPE_CC9P9360JS           1264
-#define MACH_TYPE_GALLIUM              1265
-#define MACH_TYPE_MSC2410              1266
-#define MACH_TYPE_GHI270               1267
-#define MACH_TYPE_DAVINCI_LEONARDO     1268
-#define MACH_TYPE_OIAB                 1269
-#define MACH_TYPE_SMDK6400             1270
-#define MACH_TYPE_NOKIA_N800           1271
-#define MACH_TYPE_GREENPHONE           1272
-#define MACH_TYPE_COMPEXWP18           1273
-#define MACH_TYPE_XMATE                1274
-#define MACH_TYPE_ENERGIZER            1275
-#define MACH_TYPE_IME1                 1276
-#define MACH_TYPE_SWEDATMS             1277
-#define MACH_TYPE_NTNP435C             1278
-#define MACH_TYPE_SPECTRO2             1279
-#define MACH_TYPE_H6039                1280
-#define MACH_TYPE_EP80219              1281
-#define MACH_TYPE_SAMOA_II             1282
-#define MACH_TYPE_CWMXL                1283
-#define MACH_TYPE_AS9200               1284
-#define MACH_TYPE_SFX1149              1285
-#define MACH_TYPE_NAVI010              1286
-#define MACH_TYPE_MULTMDP              1287
-#define MACH_TYPE_SCB9520              1288
-#define MACH_TYPE_HTCATHENA            1289
-#define MACH_TYPE_XP179                1290
-#define MACH_TYPE_H4300                1291
-#define MACH_TYPE_GORAMO_MLR           1292
-#define MACH_TYPE_MXC30020EVB          1293
-#define MACH_TYPE_ADSBITSYG5           1294
-#define MACH_TYPE_ADSPORTALPLUS        1295
-#define MACH_TYPE_MMSP2PLUS            1296
-#define MACH_TYPE_EM_X270              1297
-#define MACH_TYPE_TPP302               1298
-#define MACH_TYPE_TPM104               1299
-#define MACH_TYPE_TPM102               1300
-#define MACH_TYPE_TPM109               1301
-#define MACH_TYPE_FBXO1                1302
-#define MACH_TYPE_HXD8                 1303
-#define MACH_TYPE_NEO1973_GTA02        1304
-#define MACH_TYPE_EMTEST               1305
-#define MACH_TYPE_AD6900               1306
-#define MACH_TYPE_EUROPA               1307
-#define MACH_TYPE_METROCONNECT         1308
-#define MACH_TYPE_EZ_S2410             1309
-#define MACH_TYPE_EZ_S2440             1310
-#define MACH_TYPE_EZ_EP9312            1311
-#define MACH_TYPE_EZ_EP9315            1312
-#define MACH_TYPE_EZ_X7                1313
-#define MACH_TYPE_GODOTDB              1314
-#define MACH_TYPE_MISTRAL              1315
-#define MACH_TYPE_MSM                  1316
-#define MACH_TYPE_CT5910               1317
-#define MACH_TYPE_CT5912               1318
-#define MACH_TYPE_HYNET_INE            1319
-#define MACH_TYPE_HYNET_APP            1320
-#define MACH_TYPE_MSM7200              1321
-#define MACH_TYPE_MSM7600              1322
-#define MACH_TYPE_CEB255               1323
-#define MACH_TYPE_CIEL                 1324
-#define MACH_TYPE_SLM5650              1325
-#define MACH_TYPE_AT91SAM9RLEK         1326
-#define MACH_TYPE_COMTECH_ROUTER       1327
-#define MACH_TYPE_SBC2410X             1328
-#define MACH_TYPE_AT4X0BD              1329
-#define MACH_TYPE_CBIFR                1330
-#define MACH_TYPE_ARCOM_QUANTUM        1331
-#define MACH_TYPE_MATRIX520            1332
-#define MACH_TYPE_MATRIX510            1333
-#define MACH_TYPE_MATRIX500            1334
-#define MACH_TYPE_M501                 1335
-#define MACH_TYPE_AAEON1270            1336
-#define MACH_TYPE_MATRIX500EV          1337
-#define MACH_TYPE_PAC500               1338
-#define MACH_TYPE_PNX8181              1339
-#define MACH_TYPE_COLIBRI320           1340
-#define MACH_TYPE_AZTOOLBB             1341
-#define MACH_TYPE_AZTOOLG2             1342
-#define MACH_TYPE_DVLHOST              1343
-#define MACH_TYPE_ZIR9200              1344
-#define MACH_TYPE_ZIR9260              1345
-#define MACH_TYPE_COCOPAH              1346
-#define MACH_TYPE_NDS                  1347
-#define MACH_TYPE_ROSENCRANTZ          1348
-#define MACH_TYPE_FTTX_ODSC            1349
-#define MACH_TYPE_CLASSE_R6904         1350
-#define MACH_TYPE_CAM60                1351
-#define MACH_TYPE_MXC30031ADS          1352
-#define MACH_TYPE_DATACALL             1353
-#define MACH_TYPE_AT91EB01             1354
-#define MACH_TYPE_RTY                  1355
-#define MACH_TYPE_DWL2100              1356
-#define MACH_TYPE_VINSI                1357
-#define MACH_TYPE_DB88F5281            1358
-#define MACH_TYPE_CSB726               1359
-#define MACH_TYPE_TIK27                1360
-#define MACH_TYPE_MX_UC7420            1361
-#define MACH_TYPE_RIRM3                1362
-#define MACH_TYPE_PELCO_ODYSSEY        1363
-#define MACH_TYPE_ADX_ABOX             1365
-#define MACH_TYPE_ADX_TPID             1366
-#define MACH_TYPE_MINICHECK            1367
-#define MACH_TYPE_IDAM                 1368
-#define MACH_TYPE_MARIO_MX             1369
-#define MACH_TYPE_VI1888               1370
-#define MACH_TYPE_ZR4230               1371
-#define MACH_TYPE_T1_IX_BLUE           1372
-#define MACH_TYPE_SYHQ2                1373
-#define MACH_TYPE_COMPUTIME_R3         1374
-#define MACH_TYPE_ORATIS               1375
-#define MACH_TYPE_MIKKO                1376
-#define MACH_TYPE_HOLON                1377
-#define MACH_TYPE_OLIP8                1378
-#define MACH_TYPE_GHI270HG             1379
-#define MACH_TYPE_DAVINCI_DM6467_EVM   1380
-#define MACH_TYPE_DAVINCI_DM355_EVM    1381
-#define MACH_TYPE_BLACKRIVER           1383
-#define MACH_TYPE_SANDGATEWP           1384
-#define MACH_TYPE_CDOTBWSG             1385
-#define MACH_TYPE_QUARK963             1386
-#define MACH_TYPE_CSB735               1387
-#define MACH_TYPE_LITTLETON            1388
-#define MACH_TYPE_MIO_P550             1389
-#define MACH_TYPE_MOTION2440           1390
-#define MACH_TYPE_IMM500               1391
-#define MACH_TYPE_HOMEMATIC            1392
-#define MACH_TYPE_ERMINE               1393
-#define MACH_TYPE_KB9202B              1394
-#define MACH_TYPE_HS1XX                1395
-#define MACH_TYPE_STUDENTMATE2440      1396
-#define MACH_TYPE_ARVOO_L1_Z1          1397
-#define MACH_TYPE_DEP2410K             1398
-#define MACH_TYPE_XXSVIDEO             1399
-#define MACH_TYPE_IM4004               1400
-#define MACH_TYPE_OCHAYA1050           1401
-#define MACH_TYPE_LEP9261              1402
-#define MACH_TYPE_SVENMEB              1403
-#define MACH_TYPE_FORTUNET2NE          1404
-#define MACH_TYPE_NXHX                 1406
-#define MACH_TYPE_REALVIEW_PB11MP      1407
-#define MACH_TYPE_IDS500               1408
-#define MACH_TYPE_ORS_N725             1409
-#define MACH_TYPE_HSDARM               1410
-#define MACH_TYPE_SHA_PON003           1411
-#define MACH_TYPE_SHA_PON004           1412
-#define MACH_TYPE_SHA_PON007           1413
-#define MACH_TYPE_SHA_PON011           1414
-#define MACH_TYPE_H6042                1415
-#define MACH_TYPE_H6043                1416
-#define MACH_TYPE_LOOXC550             1417
-#define MACH_TYPE_CNTY_TITAN           1418
-#define MACH_TYPE_APP3XX               1419
-#define MACH_TYPE_SIDEOATSGRAMA        1420
-#define MACH_TYPE_TREO700P             1421
-#define MACH_TYPE_TREO700W             1422
-#define MACH_TYPE_TREO750              1423
-#define MACH_TYPE_TREO755P             1424
-#define MACH_TYPE_EZREGANUT9200        1425
-#define MACH_TYPE_SARGE                1426
-#define MACH_TYPE_A696                 1427
-#define MACH_TYPE_TURTLE               1428
-#define MACH_TYPE_MX27_3DS             1430
-#define MACH_TYPE_BISHOP               1431
-#define MACH_TYPE_PXX                  1432
-#define MACH_TYPE_REDWOOD              1433
-#define MACH_TYPE_OMAP_2430DLP         1436
-#define MACH_TYPE_OMAP_2430OSK         1437
-#define MACH_TYPE_SARDINE              1438
-#define MACH_TYPE_HALIBUT              1439
-#define MACH_TYPE_TROUT                1440
-#define MACH_TYPE_GOLDFISH             1441
-#define MACH_TYPE_GESBC2440            1442
-#define MACH_TYPE_NOMAD                1443
-#define MACH_TYPE_ROSALIND             1444
-#define MACH_TYPE_CC9P9215             1445
-#define MACH_TYPE_CC9P9210             1446
-#define MACH_TYPE_CC9P9215JS           1447
-#define MACH_TYPE_CC9P9210JS           1448
-#define MACH_TYPE_NASFFE               1449
-#define MACH_TYPE_TN2X0BD              1450
-#define MACH_TYPE_GWMPXA               1451
-#define MACH_TYPE_EXYPLUS              1452
-#define MACH_TYPE_JADOO21              1453
-#define MACH_TYPE_LOOXN560             1454
-#define MACH_TYPE_BONSAI               1455
-#define MACH_TYPE_ADSMILGATO           1456
-#define MACH_TYPE_GBA                  1457
-#define MACH_TYPE_H6044                1458
-#define MACH_TYPE_APP                  1459
-#define MACH_TYPE_TCT_HAMMER           1460
-#define MACH_TYPE_HERALD               1461
-#define MACH_TYPE_ARTEMIS              1462
-#define MACH_TYPE_HTCTITAN             1463
-#define MACH_TYPE_QRANIUM              1464
-#define MACH_TYPE_ADX_WSC2             1465
-#define MACH_TYPE_ADX_MEDCOM           1466
-#define MACH_TYPE_BBOARD               1467
-#define MACH_TYPE_CAMBRIA              1468
-#define MACH_TYPE_MT7XXX               1469
-#define MACH_TYPE_MATRIX512            1470
-#define MACH_TYPE_MATRIX522            1471
-#define MACH_TYPE_IPAC5010             1472
-#define MACH_TYPE_SAKURA               1473
-#define MACH_TYPE_GROCX                1474
-#define MACH_TYPE_PM9263               1475
-#define MACH_TYPE_SIM_ONE              1476
-#define MACH_TYPE_ACQ132               1477
-#define MACH_TYPE_DATR                 1478
-#define MACH_TYPE_ACTUX1               1479
-#define MACH_TYPE_ACTUX2               1480
-#define MACH_TYPE_ACTUX3               1481
-#define MACH_TYPE_FLEXIT               1482
-#define MACH_TYPE_BH2X0BD              1483
-#define MACH_TYPE_ATB2002              1484
-#define MACH_TYPE_XENON                1485
-#define MACH_TYPE_FM607                1486
-#define MACH_TYPE_MATRIX514            1487
-#define MACH_TYPE_MATRIX524            1488
-#define MACH_TYPE_INPOD                1489
-#define MACH_TYPE_JIVE                 1490
-#define MACH_TYPE_TLL_MX21             1491
-#define MACH_TYPE_SBC2800              1492
-#define MACH_TYPE_CC7UCAMRY            1493
-#define MACH_TYPE_UBISYS_P9_SC15       1494
-#define MACH_TYPE_UBISYS_P9_SSC2D10    1495
-#define MACH_TYPE_UBISYS_P9_RCU3       1496
-#define MACH_TYPE_AML_M8000            1497
-#define MACH_TYPE_SNAPPER_270          1498
-#define MACH_TYPE_OMAP_BBX             1499
-#define MACH_TYPE_UCN2410              1500
-#define MACH_TYPE_SAM9_L9260           1501
-#define MACH_TYPE_ETI_C2               1502
-#define MACH_TYPE_AVALANCHE            1503
-#define MACH_TYPE_REALVIEW_PB1176      1504
-#define MACH_TYPE_DP1500               1505
-#define MACH_TYPE_APPLE_IPHONE         1506
-#define MACH_TYPE_YL9200               1507
-#define MACH_TYPE_RD88F5182            1508
-#define MACH_TYPE_KUROBOX_PRO          1509
-#define MACH_TYPE_SE_POET              1510
-#define MACH_TYPE_MX31_3DS             1511
-#define MACH_TYPE_R270                 1512
-#define MACH_TYPE_ARMOUR21             1513
-#define MACH_TYPE_DT2                  1514
-#define MACH_TYPE_VT4                  1515
-#define MACH_TYPE_TYCO320              1516
-#define MACH_TYPE_ADMA                 1517
-#define MACH_TYPE_WP188                1518
-#define MACH_TYPE_CORSICA              1519
-#define MACH_TYPE_BIGEYE               1520
-#define MACH_TYPE_TLL5000              1522
-#define MACH_TYPE_BEBOT                1523
-#define MACH_TYPE_QONG                 1524
-#define MACH_TYPE_TCOMPACT             1525
-#define MACH_TYPE_PUMA5                1526
-#define MACH_TYPE_ELARA                1527
-#define MACH_TYPE_ELLINGTON            1528
-#define MACH_TYPE_XDA_ATOM             1529
-#define MACH_TYPE_ENERGIZER2           1530
-#define MACH_TYPE_ODIN                 1531
-#define MACH_TYPE_ACTUX4               1532
-#define MACH_TYPE_ESL_OMAP             1533
-#define MACH_TYPE_OMAP2EVM             1534
-#define MACH_TYPE_OMAP3EVM             1535
-#define MACH_TYPE_ADX_PCU57            1536
-#define MACH_TYPE_MONACO               1537
-#define MACH_TYPE_LEVANTE              1538
-#define MACH_TYPE_TMXIPX425            1539
-#define MACH_TYPE_LEEP                 1540
-#define MACH_TYPE_RAAD                 1541
-#define MACH_TYPE_DNS323               1542
-#define MACH_TYPE_AP1000               1543
-#define MACH_TYPE_A9SAM6432            1544
-#define MACH_TYPE_SHINY                1545
-#define MACH_TYPE_OMAP3_BEAGLE         1546
-#define MACH_TYPE_CSR_BDB2             1547
-#define MACH_TYPE_NOKIA_N810           1548
-#define MACH_TYPE_C270                 1549
-#define MACH_TYPE_SENTRY               1550
-#define MACH_TYPE_PCM038               1551
-#define MACH_TYPE_ANC300               1552
-#define MACH_TYPE_HTCKAISER            1553
-#define MACH_TYPE_SBAT100              1554
-#define MACH_TYPE_MODUNORM             1555
-#define MACH_TYPE_PELOS_TWARM          1556
-#define MACH_TYPE_FLANK                1557
-#define MACH_TYPE_SIRLOIN              1558
-#define MACH_TYPE_BRISKET              1559
-#define MACH_TYPE_CHUCK                1560
-#define MACH_TYPE_OTTER                1561
-#define MACH_TYPE_DAVINCI_LDK          1562
-#define MACH_TYPE_PHREEDOM             1563
-#define MACH_TYPE_SG310                1564
-#define MACH_TYPE_TS209                1565
-#define MACH_TYPE_AT91CAP9ADK          1566
-#define MACH_TYPE_TION9315             1567
-#define MACH_TYPE_MAST                 1568
-#define MACH_TYPE_PFW                  1569
-#define MACH_TYPE_YL_P2440             1570
-#define MACH_TYPE_ZSBC32               1571
-#define MACH_TYPE_OMAP_PACE2           1572
-#define MACH_TYPE_IMX_PACE2            1573
-#define MACH_TYPE_MX31MOBOARD          1574
-#define MACH_TYPE_MX37_3DS             1575
-#define MACH_TYPE_RCC                  1576
-#define MACH_TYPE_ARM9                 1577
-#define MACH_TYPE_VISION_EP9307        1578
-#define MACH_TYPE_SCLY1000             1579
-#define MACH_TYPE_FONTEL_EP            1580
-#define MACH_TYPE_VOICEBLUE3G          1581
-#define MACH_TYPE_TT9200               1582
-#define MACH_TYPE_DIGI2410             1583
-#define MACH_TYPE_TERASTATION_PRO2     1584
-#define MACH_TYPE_LINKSTATION_PRO      1585
-#define MACH_TYPE_MOTOROLA_A780        1587
-#define MACH_TYPE_MOTOROLA_E6          1588
-#define MACH_TYPE_MOTOROLA_E2          1589
-#define MACH_TYPE_MOTOROLA_E680        1590
-#define MACH_TYPE_UR2410               1591
-#define MACH_TYPE_TAS9261              1592
-#define MACH_TYPE_HERMES_HD            1593
-#define MACH_TYPE_PERSEO_HD            1594
-#define MACH_TYPE_STARGAZER2           1595
-#define MACH_TYPE_E350                 1596
-#define MACH_TYPE_WPCM450              1597
-#define MACH_TYPE_CARTESIO             1598
-#define MACH_TYPE_TOYBOX               1599
-#define MACH_TYPE_TX27                 1600
-#define MACH_TYPE_TS409                1601
-#define MACH_TYPE_P300                 1602
-#define MACH_TYPE_XDACOMET             1603
-#define MACH_TYPE_DEXFLEX2             1604
-#define MACH_TYPE_OW                   1605
-#define MACH_TYPE_ARMEBS3              1606
-#define MACH_TYPE_U3                   1607
-#define MACH_TYPE_SMDK2450             1608
-#define MACH_TYPE_RSI_EWS              1609
-#define MACH_TYPE_TNB                  1610
-#define MACH_TYPE_TOEPATH              1611
-#define MACH_TYPE_KB9263               1612
-#define MACH_TYPE_MT7108               1613
-#define MACH_TYPE_SMTR2440             1614
-#define MACH_TYPE_MANAO                1615
-#define MACH_TYPE_CM_X300              1616
-#define MACH_TYPE_GULFSTREAM_KP        1617
-#define MACH_TYPE_LANREADYFN522        1618
-#define MACH_TYPE_ARMA37               1619
-#define MACH_TYPE_MENDEL               1620
-#define MACH_TYPE_PELCO_ILIAD          1621
-#define MACH_TYPE_UNIT2P               1622
-#define MACH_TYPE_INC20OTTER           1623
-#define MACH_TYPE_AT91SAM9G20EK        1624
-#define MACH_TYPE_STORCENTER           1625
-#define MACH_TYPE_SMDK6410             1626
-#define MACH_TYPE_U300                 1627
-#define MACH_TYPE_U500                 1628
-#define MACH_TYPE_DS9260               1629
-#define MACH_TYPE_RIVERROCK            1630
-#define MACH_TYPE_SCIBATH              1631
-#define MACH_TYPE_AT91SAM7SE512EK      1632
-#define MACH_TYPE_WRT350N_V2           1633
-#define MACH_TYPE_MULTIMEDIA           1634
-#define MACH_TYPE_MARVIN               1635
-#define MACH_TYPE_X500                 1636
-#define MACH_TYPE_AWLUG4LCU            1637
-#define MACH_TYPE_PALERMOC             1638
-#define MACH_TYPE_OMAP_LDP             1639
-#define MACH_TYPE_IP500                1640
-#define MACH_TYPE_ASE2                 1642
-#define MACH_TYPE_MX35EVB              1643
-#define MACH_TYPE_AML_M8050            1644
-#define MACH_TYPE_MX35_3DS             1645
-#define MACH_TYPE_MARS                 1646
-#define MACH_TYPE_NEUROS_OSD2          1647
-#define MACH_TYPE_BADGER               1648
-#define MACH_TYPE_TRIZEPS4WL           1649
-#define MACH_TYPE_TRIZEPS5             1650
-#define MACH_TYPE_MARLIN               1651
-#define MACH_TYPE_TS78XX               1652
-#define MACH_TYPE_HPIPAQ214            1653
-#define MACH_TYPE_AT572D940DCM         1654
-#define MACH_TYPE_NE1BOARD             1655
-#define MACH_TYPE_ZANTE                1656
-#define MACH_TYPE_SFFSDR               1657
-#define MACH_TYPE_TW2662               1658
-#define MACH_TYPE_VF10XX               1659
-#define MACH_TYPE_ZORAN43XX            1660
-#define MACH_TYPE_SONIX926             1661
-#define MACH_TYPE_CELESTIALSEMI        1662
-#define MACH_TYPE_CC9M2443JS           1663
-#define MACH_TYPE_TW5334               1664
-#define MACH_TYPE_HTCARTEMIS           1665
-#define MACH_TYPE_NAL_HLITE            1666
-#define MACH_TYPE_HTCVOGUE             1667
-#define MACH_TYPE_SMARTWEB             1668
-#define MACH_TYPE_MV86XX               1669
-#define MACH_TYPE_MV87XX               1670
-#define MACH_TYPE_SONGYOUNGHO          1671
-#define MACH_TYPE_YOUNGHOTEMA          1672
-#define MACH_TYPE_PCM037               1673
-#define MACH_TYPE_MMVP                 1674
-#define MACH_TYPE_MMAP                 1675
-#define MACH_TYPE_PTID2410             1676
-#define MACH_TYPE_JAMES_926            1677
-#define MACH_TYPE_FM6000               1678
-#define MACH_TYPE_DB88F6281_BP         1680
-#define MACH_TYPE_RD88F6192_NAS        1681
-#define MACH_TYPE_RD88F6281            1682
-#define MACH_TYPE_DB78X00_BP           1683
-#define MACH_TYPE_SMDK2416             1685
-#define MACH_TYPE_OCE_SPIDER_SI        1686
-#define MACH_TYPE_OCE_SPIDER_SK        1687
-#define MACH_TYPE_ROVERN6              1688
-#define MACH_TYPE_PELCO_EVOLUTION      1689
-#define MACH_TYPE_WBD111               1690
-#define MACH_TYPE_ELARACPE             1691
-#define MACH_TYPE_MABV3                1692
-#define MACH_TYPE_MV2120               1693
-#define MACH_TYPE_CSB737               1695
-#define MACH_TYPE_MX51_3DS             1696
-#define MACH_TYPE_G900                 1697
-#define MACH_TYPE_APF27                1698
-#define MACH_TYPE_GGUS2000             1699
-#define MACH_TYPE_OMAP_2430_MIMIC      1700
-#define MACH_TYPE_IMX27LITE            1701
-#define MACH_TYPE_ALMEX                1702
-#define MACH_TYPE_CONTROL              1703
-#define MACH_TYPE_MBA2410              1704
-#define MACH_TYPE_VOLCANO              1705
-#define MACH_TYPE_ZENITH               1706
-#define MACH_TYPE_MUCHIP               1707
-#define MACH_TYPE_MAGELLAN             1708
-#define MACH_TYPE_USB_A9260            1709
-#define MACH_TYPE_USB_A9263            1710
-#define MACH_TYPE_QIL_A9260            1711
-#define MACH_TYPE_CME9210              1712
-#define MACH_TYPE_HCZH4                1713
-#define MACH_TYPE_SPEARBASIC           1714
-#define MACH_TYPE_DEP2440              1715
-#define MACH_TYPE_HDL_GXR              1716
-#define MACH_TYPE_HDL_GT               1717
-#define MACH_TYPE_HDL_4G               1718
-#define MACH_TYPE_S3C6000              1719
-#define MACH_TYPE_MMSP2_MDK            1720
-#define MACH_TYPE_MPX220               1721
-#define MACH_TYPE_KZM_ARM11_01         1722
-#define MACH_TYPE_HTC_POLARIS          1723
-#define MACH_TYPE_HTC_KAISER           1724
-#define MACH_TYPE_LG_KS20              1725
-#define MACH_TYPE_HHGPS                1726
-#define MACH_TYPE_NOKIA_N810_WIMAX     1727
-#define MACH_TYPE_INSIGHT              1728
-#define MACH_TYPE_SAPPHIRE             1729
-#define MACH_TYPE_CSB637XO             1730
-#define MACH_TYPE_EVISIONG             1731
-#define MACH_TYPE_STMP37XX             1732
-#define MACH_TYPE_STMP378X             1733
-#define MACH_TYPE_TNT                  1734
-#define MACH_TYPE_TBXT                 1735
-#define MACH_TYPE_PLAYMATE             1736
-#define MACH_TYPE_PNS10                1737
-#define MACH_TYPE_EZNAVI               1738
-#define MACH_TYPE_PS4000               1739
-#define MACH_TYPE_EZX_A780             1740
-#define MACH_TYPE_EZX_E680             1741
-#define MACH_TYPE_EZX_A1200            1742
-#define MACH_TYPE_EZX_E6               1743
-#define MACH_TYPE_EZX_E2               1744
-#define MACH_TYPE_EZX_A910             1745
-#define MACH_TYPE_CWMX31               1746
-#define MACH_TYPE_SL2312               1747
-#define MACH_TYPE_BLENNY               1748
-#define MACH_TYPE_DS107                1749
-#define MACH_TYPE_DSX07                1750
-#define MACH_TYPE_PICOCOM1             1751
-#define MACH_TYPE_LYNX_WOLVERINE       1752
-#define MACH_TYPE_UBISYS_P9_SC19       1753
-#define MACH_TYPE_KRATOS_LOW           1754
-#define MACH_TYPE_M700                 1755
-#define MACH_TYPE_EDMINI_V2            1756
-#define MACH_TYPE_ZIPIT2               1757
-#define MACH_TYPE_HSLFEMTOCELL         1758
-#define MACH_TYPE_DAINTREE_AT91        1759
-#define MACH_TYPE_SG560USB             1760
-#define MACH_TYPE_OMAP3_PANDORA        1761
-#define MACH_TYPE_USR8200              1762
-#define MACH_TYPE_S1S65K               1763
-#define MACH_TYPE_S2S65A               1764
-#define MACH_TYPE_ICORE                1765
-#define MACH_TYPE_MSS2                 1766
-#define MACH_TYPE_BELMONT              1767
-#define MACH_TYPE_ASUSP525             1768
-#define MACH_TYPE_LB88RC8480           1769
-#define MACH_TYPE_HIPXA                1770
-#define MACH_TYPE_MX25_3DS             1771
-#define MACH_TYPE_M800                 1772
-#define MACH_TYPE_OMAP3530_LV_SOM      1773
-#define MACH_TYPE_PRIMA_EVB            1774
-#define MACH_TYPE_MX31BT1              1775
-#define MACH_TYPE_ATLAS4_EVB           1776
-#define MACH_TYPE_MX31CICADA           1777
-#define MACH_TYPE_MI424WR              1778
-#define MACH_TYPE_AXS_ULTRAX           1779
-#define MACH_TYPE_AT572D940DEB         1780
-#define MACH_TYPE_DAVINCI_DA830_EVM    1781
-#define MACH_TYPE_EP9302               1782
-#define MACH_TYPE_AT572D940HFEB        1783
-#define MACH_TYPE_CYBOOK3              1784
-#define MACH_TYPE_WDG002               1785
-#define MACH_TYPE_SG560ADSL            1786
-#define MACH_TYPE_NEXTIO_N2800_ICA     1787
-#define MACH_TYPE_MARVELL_NEWDB        1789
-#define MACH_TYPE_VANDIHUD             1790
-#define MACH_TYPE_MAGX_E8              1791
-#define MACH_TYPE_MAGX_Z6              1792
-#define MACH_TYPE_MAGX_V8              1793
-#define MACH_TYPE_MAGX_U9              1794
-#define MACH_TYPE_TOUGHCF08            1795
-#define MACH_TYPE_ZW4400               1796
-#define MACH_TYPE_MARAT91              1797
-#define MACH_TYPE_OVERO                1798
-#define MACH_TYPE_AT2440EVB            1799
-#define MACH_TYPE_NEOCORE926           1800
-#define MACH_TYPE_WNR854T              1801
-#define MACH_TYPE_IMX27                1802
-#define MACH_TYPE_MOOSE_DB             1803
-#define MACH_TYPE_FAB4                 1804
-#define MACH_TYPE_HTCDIAMOND           1805
-#define MACH_TYPE_FIONA                1806
-#define MACH_TYPE_MXC30030_X           1807
-#define MACH_TYPE_BMP1000              1808
-#define MACH_TYPE_LOGI9200             1809
-#define MACH_TYPE_TQMA31               1810
-#define MACH_TYPE_CCW9P9215JS          1811
-#define MACH_TYPE_RD88F5181L_GE        1812
-#define MACH_TYPE_SIFMAIN              1813
-#define MACH_TYPE_SAM9_L9261           1814
-#define MACH_TYPE_CC9M2443             1815
-#define MACH_TYPE_XARIA300             1816
-#define MACH_TYPE_IT9200               1817
-#define MACH_TYPE_RD88F5181L_FXO       1818
-#define MACH_TYPE_KRISS_SENSOR         1819
-#define MACH_TYPE_PILZ_PMI5            1820
-#define MACH_TYPE_JADE                 1821
-#define MACH_TYPE_KS8695_SOFTPLC       1822
-#define MACH_TYPE_GPRISC3              1823
-#define MACH_TYPE_STAMP9G20            1824
-#define MACH_TYPE_SMDK6430             1825
-#define MACH_TYPE_SMDKC100             1826
-#define MACH_TYPE_TAVOREVB             1827
-#define MACH_TYPE_SAAR                 1828
-#define MACH_TYPE_DEISTER_EYECAM       1829
-#define MACH_TYPE_AT91SAM9M10G45EK     1830
-#define MACH_TYPE_LINKSTATION_PRODUO   1831
-#define MACH_TYPE_HIT_B0               1832
-#define MACH_TYPE_ADX_RMU              1833
-#define MACH_TYPE_XG_CPE_MAIN          1834
-#define MACH_TYPE_EDB9407A             1835
-#define MACH_TYPE_DTB9608              1836
-#define MACH_TYPE_EM104V1              1837
-#define MACH_TYPE_DEMO                 1838
-#define MACH_TYPE_LOGI9260             1839
-#define MACH_TYPE_MX31_EXM32           1840
-#define MACH_TYPE_USB_A9G20            1841
-#define MACH_TYPE_PICPROJE2008         1842
-#define MACH_TYPE_CS_E9315             1843
-#define MACH_TYPE_QIL_A9G20            1844
-#define MACH_TYPE_SHA_PON020           1845
-#define MACH_TYPE_NAD                  1846
-#define MACH_TYPE_SBC35_A9260          1847
-#define MACH_TYPE_SBC35_A9G20          1848
-#define MACH_TYPE_DAVINCI_BEGINNING    1849
-#define MACH_TYPE_UWC                  1850
-#define MACH_TYPE_MXLADS               1851
-#define MACH_TYPE_HTCNIKE              1852
-#define MACH_TYPE_DEISTER_PXA270       1853
-#define MACH_TYPE_CME9210JS            1854
-#define MACH_TYPE_CC9P9360             1855
-#define MACH_TYPE_MOCHA                1856
-#define MACH_TYPE_WAPD170AG            1857
-#define MACH_TYPE_LINKSTATION_MINI     1858
-#define MACH_TYPE_AFEB9260             1859
-#define MACH_TYPE_W90X900              1860
-#define MACH_TYPE_W90X700              1861
-#define MACH_TYPE_KT300IP              1862
-#define MACH_TYPE_KT300IP_G20          1863
-#define MACH_TYPE_SRCM                 1864
-#define MACH_TYPE_WLNX_9260            1865
-#define MACH_TYPE_OPENMOKO_GTA03       1866
-#define MACH_TYPE_OSPREY2              1867
-#define MACH_TYPE_KBIO9260             1868
-#define MACH_TYPE_GINZA                1869
-#define MACH_TYPE_A636N                1870
-#define MACH_TYPE_IMX27IPCAM           1871
-#define MACH_TYPE_NEMOC                1872
-#define MACH_TYPE_GENEVA               1873
-#define MACH_TYPE_HTCPHAROS            1874
-#define MACH_TYPE_NEONC                1875
-#define MACH_TYPE_NAS7100              1876
-#define MACH_TYPE_TEUPHONE             1877
-#define MACH_TYPE_ANNAX_ETH2           1878
-#define MACH_TYPE_CSB733               1879
-#define MACH_TYPE_BK3                  1880
-#define MACH_TYPE_OMAP_EM32            1881
-#define MACH_TYPE_ET9261CP             1882
-#define MACH_TYPE_JASPERC              1883
-#define MACH_TYPE_ISSI_ARM9            1884
-#define MACH_TYPE_UED                  1885
-#define MACH_TYPE_ESIBLADE             1886
-#define MACH_TYPE_EYE02                1887
-#define MACH_TYPE_IMX27KBD             1888
-#define MACH_TYPE_SST61VC010_FPGA      1889
-#define MACH_TYPE_KIXVP435             1890
-#define MACH_TYPE_KIXNP435             1891
-#define MACH_TYPE_AFRICA               1892
-#define MACH_TYPE_NH233                1893
-#define MACH_TYPE_RD88F6183AP_GE       1894
-#define MACH_TYPE_BCM4760              1895
-#define MACH_TYPE_EDDY_V2              1896
-#define MACH_TYPE_REALVIEW_PBA8        1897
-#define MACH_TYPE_HID_A7               1898
-#define MACH_TYPE_HERO                 1899
-#define MACH_TYPE_OMAP_POSEIDON        1900
-#define MACH_TYPE_REALVIEW_PBX         1901
-#define MACH_TYPE_MICRO9S              1902
-#define MACH_TYPE_MAKO                 1903
-#define MACH_TYPE_XDAFLAME             1904
-#define MACH_TYPE_PHIDGET_SBC2         1905
-#define MACH_TYPE_LIMESTONE            1906
-#define MACH_TYPE_IPROBE_C32           1907
-#define MACH_TYPE_RUT100               1908
-#define MACH_TYPE_ASUSP535             1909
-#define MACH_TYPE_HTCRAPHAEL           1910
-#define MACH_TYPE_SYGDG1               1911
-#define MACH_TYPE_SYGDG2               1912
-#define MACH_TYPE_SEOUL                1913
-#define MACH_TYPE_SALERNO              1914
-#define MACH_TYPE_UCN_S3C64XX          1915
-#define MACH_TYPE_MSM7201A             1916
-#define MACH_TYPE_LPR1                 1917
-#define MACH_TYPE_ARMADILLO500FX       1918
-#define MACH_TYPE_G3EVM                1919
-#define MACH_TYPE_Z3_DM355             1920
-#define MACH_TYPE_W90P910EVB           1921
-#define MACH_TYPE_W90P920EVB           1922
-#define MACH_TYPE_W90P950EVB           1923
-#define MACH_TYPE_W90N960EVB           1924
-#define MACH_TYPE_CAMHD                1925
-#define MACH_TYPE_MVC100               1926
-#define MACH_TYPE_ELECTRUM_200         1927
-#define MACH_TYPE_HTCJADE              1928
-#define MACH_TYPE_MEMPHIS              1929
-#define MACH_TYPE_IMX27SBC             1930
-#define MACH_TYPE_LEXTAR               1931
-#define MACH_TYPE_MV88F6281GTW_GE      1932
-#define MACH_TYPE_NCP                  1933
-#define MACH_TYPE_Z32AN                1934
-#define MACH_TYPE_TMQ_CAPD             1935
-#define MACH_TYPE_OMAP3_WL             1936
-#define MACH_TYPE_CHUMBY               1937
-#define MACH_TYPE_ATSARM9              1938
-#define MACH_TYPE_DAVINCI_DM365_EVM    1939
-#define MACH_TYPE_BAHAMAS              1940
-#define MACH_TYPE_DAS                  1941
-#define MACH_TYPE_MINIDAS              1942
-#define MACH_TYPE_VK1000               1943
-#define MACH_TYPE_CENTRO               1944
-#define MACH_TYPE_CTERA_2BAY           1945
-#define MACH_TYPE_EDGECONNECT          1946
-#define MACH_TYPE_ND27000              1947
-#define MACH_TYPE_GEMALTO_COBRA        1948
-#define MACH_TYPE_INGELABS_COMET       1949
-#define MACH_TYPE_POLLUX_WIZ           1950
-#define MACH_TYPE_BLACKSTONE           1951
-#define MACH_TYPE_TOPAZ                1952
-#define MACH_TYPE_AIXLE                1953
-#define MACH_TYPE_MW998                1954
-#define MACH_TYPE_NOKIA_RX51           1955
-#define MACH_TYPE_VSC5605EV            1956
-#define MACH_TYPE_NT98700DK            1957
-#define MACH_TYPE_ICONTACT             1958
-#define MACH_TYPE_SWARCO_FRCPU         1959
-#define MACH_TYPE_SWARCO_SCPU          1960
-#define MACH_TYPE_BBOX_P16             1961
-#define MACH_TYPE_BSTD                 1962
-#define MACH_TYPE_SBC2440II            1963
-#define MACH_TYPE_PCM034               1964
-#define MACH_TYPE_NESO                 1965
-#define MACH_TYPE_WLNX_9G20            1966
-#define MACH_TYPE_OMAP_ZOOM2           1967
-#define MACH_TYPE_TOTEMNOVA            1968
-#define MACH_TYPE_C5000                1969
-#define MACH_TYPE_UNIPO_AT91SAM9263    1970
-#define MACH_TYPE_ETHERNUT5            1971
-#define MACH_TYPE_ARM11                1972
-#define MACH_TYPE_CPUAT9260            1973
-#define MACH_TYPE_CPUPXA255            1974
-#define MACH_TYPE_CPUIMX27             1975
-#define MACH_TYPE_CHEFLUX              1976
-#define MACH_TYPE_EB_CPUX9K2           1977
-#define MACH_TYPE_OPCOTEC              1978
-#define MACH_TYPE_YT                   1979
-#define MACH_TYPE_MOTOQ                1980
-#define MACH_TYPE_BSB1                 1981
-#define MACH_TYPE_ACS5K                1982
-#define MACH_TYPE_MILAN                1983
-#define MACH_TYPE_QUARTZV2             1984
-#define MACH_TYPE_RSVP                 1985
-#define MACH_TYPE_RMP200               1986
-#define MACH_TYPE_SNAPPER_9260         1987
-#define MACH_TYPE_DSM320               1988
-#define MACH_TYPE_ADSGCM               1989
-#define MACH_TYPE_ASE2_400             1990
-#define MACH_TYPE_PIZZA                1991
-#define MACH_TYPE_SPOT_NGPL            1992
-#define MACH_TYPE_ARMATA               1993
-#define MACH_TYPE_EXEDA                1994
-#define MACH_TYPE_MX31SF005            1995
-#define MACH_TYPE_F5D8231_4_V2         1996
-#define MACH_TYPE_Q2440                1997
-#define MACH_TYPE_QQ2440               1998
-#define MACH_TYPE_MINI2440             1999
-#define MACH_TYPE_COLIBRI300           2000
-#define MACH_TYPE_JADES                2001
-#define MACH_TYPE_SPARK                2002
-#define MACH_TYPE_BENZINA              2003
-#define MACH_TYPE_BLAZE                2004
-#define MACH_TYPE_LINKSTATION_LS_HGL   2005
-#define MACH_TYPE_HTCVENUS             2006
-#define MACH_TYPE_SONY_PRS505          2007
-#define MACH_TYPE_HANLIN_V3            2008
-#define MACH_TYPE_SAPPHIRA             2009
-#define MACH_TYPE_DACK_SDA_01          2010
-#define MACH_TYPE_ARMBOX               2011
-#define MACH_TYPE_HARRIS_RVP           2012
-#define MACH_TYPE_RIBALDO              2013
-#define MACH_TYPE_AGORA                2014
-#define MACH_TYPE_OMAP3_MINI           2015
-#define MACH_TYPE_A9SAM6432_B          2016
-#define MACH_TYPE_USG2410              2017
-#define MACH_TYPE_PC72052_I10_REVB     2018
-#define MACH_TYPE_MX35_EXM32           2019
-#define MACH_TYPE_TOPAS910             2020
-#define MACH_TYPE_HYENA                2021
-#define MACH_TYPE_POSPAX               2022
-#define MACH_TYPE_HDL_GX               2023
-#define MACH_TYPE_CTERA_4BAY           2024
-#define MACH_TYPE_CTERA_PLUG_C         2025
-#define MACH_TYPE_CRWEA_PLUG_I         2026
-#define MACH_TYPE_EGAUGE2              2027
-#define MACH_TYPE_DIDJ                 2028
-#define MACH_TYPE_MEISTER              2029
-#define MACH_TYPE_HTCBLACKSTONE        2030
-#define MACH_TYPE_CPUAT9G20            2031
-#define MACH_TYPE_SMDK6440             2032
-#define MACH_TYPE_OMAP_35XX_MVP        2033
-#define MACH_TYPE_CTERA_PLUG_I         2034
-#define MACH_TYPE_PVG610               2035
-#define MACH_TYPE_HPRW6815             2036
-#define MACH_TYPE_OMAP3_OSWALD         2037
-#define MACH_TYPE_NAS4220B             2038
-#define MACH_TYPE_HTCRAPHAEL_CDMA      2039
-#define MACH_TYPE_HTCDIAMOND_CDMA      2040
-#define MACH_TYPE_SCALER               2041
-#define MACH_TYPE_ZYLONITE2            2042
-#define MACH_TYPE_ASPENITE             2043
-#define MACH_TYPE_TETON                2044
-#define MACH_TYPE_TTC_DKB              2045
-#define MACH_TYPE_BISHOP2              2046
-#define MACH_TYPE_IPPV5                2047
-#define MACH_TYPE_FARM926              2048
-#define MACH_TYPE_MMCCPU               2049
-#define MACH_TYPE_SGMSFL               2050
-#define MACH_TYPE_TT8000               2051
-#define MACH_TYPE_ZRN4300LP            2052
-#define MACH_TYPE_MPTC                 2053
-#define MACH_TYPE_H6051                2054
-#define MACH_TYPE_PVG610_101           2055
-#define MACH_TYPE_STAMP9261_PC_EVB     2056
-#define MACH_TYPE_PELCO_ODYSSEUS       2057
-#define MACH_TYPE_TNY_A9260            2058
-#define MACH_TYPE_TNY_A9G20            2059
-#define MACH_TYPE_AESOP_MP2530F        2060
-#define MACH_TYPE_DX900                2061
-#define MACH_TYPE_CPODC2               2062
-#define MACH_TYPE_TILT_8925            2063
-#define MACH_TYPE_DAVINCI_DM357_EVM    2064
-#define MACH_TYPE_SWORDFISH            2065
-#define MACH_TYPE_CORVUS               2066
-#define MACH_TYPE_TAURUS               2067
-#define MACH_TYPE_AXM                  2068
-#define MACH_TYPE_AXC                  2069
-#define MACH_TYPE_BABY                 2070
-#define MACH_TYPE_MP200                2071
-#define MACH_TYPE_PCM043               2072
-#define MACH_TYPE_HANLIN_V3C           2073
-#define MACH_TYPE_KBK9G20              2074
-#define MACH_TYPE_ADSTURBOG5           2075
-#define MACH_TYPE_AVENGER_LITE1        2076
-#define MACH_TYPE_SUC                  2077
-#define MACH_TYPE_AT91SAM7S256         2078
-#define MACH_TYPE_MENDOZA              2079
-#define MACH_TYPE_KIRA                 2080
-#define MACH_TYPE_MX1HBM               2081
-#define MACH_TYPE_QUATRO43XX           2082
-#define MACH_TYPE_QUATRO4230           2083
-#define MACH_TYPE_NSB400               2084
-#define MACH_TYPE_DRP255               2085
-#define MACH_TYPE_THOTH                2086
-#define MACH_TYPE_FIRESTONE            2087
-#define MACH_TYPE_ASUSP750             2088
-#define MACH_TYPE_CTERA_DL             2089
-#define MACH_TYPE_SOCR                 2090
-#define MACH_TYPE_HTCOXYGEN            2091
-#define MACH_TYPE_HEROC                2092
-#define MACH_TYPE_ZENO6800             2093
-#define MACH_TYPE_SC2MCS               2094
-#define MACH_TYPE_GENE100              2095
-#define MACH_TYPE_AS353X               2096
-#define MACH_TYPE_SHEEVAPLUG           2097
-#define MACH_TYPE_AT91SAM9G20          2098
-#define MACH_TYPE_MV88F6192GTW_FE      2099
-#define MACH_TYPE_CC9200               2100
-#define MACH_TYPE_SM9200               2101
-#define MACH_TYPE_TP9200               2102
-#define MACH_TYPE_SNAPPERDV            2103
-#define MACH_TYPE_AVENGERS_LITE        2104
-#define MACH_TYPE_AVENGERS_LITE1       2105
-#define MACH_TYPE_OMAP3AXON            2106
-#define MACH_TYPE_MA8XX                2107
-#define MACH_TYPE_MP201EK              2108
-#define MACH_TYPE_DAVINCI_TUX          2109
-#define MACH_TYPE_MPA1600              2110
-#define MACH_TYPE_PELCO_TROY           2111
-#define MACH_TYPE_NSB667               2112
-#define MACH_TYPE_ROVERS5_4MPIX        2113
-#define MACH_TYPE_TWOCOM               2114
-#define MACH_TYPE_UBISYS_P9_RCU3R2     2115
-#define MACH_TYPE_HERO_ESPRESSO        2116
-#define MACH_TYPE_AFEUSB               2117
-#define MACH_TYPE_T830                 2118
-#define MACH_TYPE_SPD8020_CC           2119
-#define MACH_TYPE_OM_3D7K              2120
-#define MACH_TYPE_PICOCOM2             2121
-#define MACH_TYPE_UWG4MX27             2122
-#define MACH_TYPE_UWG4MX31             2123
-#define MACH_TYPE_CHERRY               2124
-#define MACH_TYPE_MX51_BABBAGE         2125
-#define MACH_TYPE_S3C2440TURKIYE       2126
-#define MACH_TYPE_TX37                 2127
-#define MACH_TYPE_SBC2800_9G20         2128
-#define MACH_TYPE_BENZGLB              2129
-#define MACH_TYPE_BENZTD               2130
-#define MACH_TYPE_CARTESIO_PLUS        2131
-#define MACH_TYPE_SOLRAD_G20           2132
-#define MACH_TYPE_MX27WALLACE          2133
-#define MACH_TYPE_FMZWEBMODUL          2134
-#define MACH_TYPE_RD78X00_MASA         2135
-#define MACH_TYPE_SMALLOGGER           2136
-#define MACH_TYPE_CCW9P9215            2137
-#define MACH_TYPE_DM355_LEOPARD        2138
-#define MACH_TYPE_TS219                2139
-#define MACH_TYPE_TNY_A9263            2140
-#define MACH_TYPE_APOLLO               2141
-#define MACH_TYPE_AT91CAP9STK          2142
-#define MACH_TYPE_SPC300               2143
-#define MACH_TYPE_EKO                  2144
-#define MACH_TYPE_CCW9M2443            2145
-#define MACH_TYPE_CCW9M2443JS          2146
-#define MACH_TYPE_M2M_ROUTER_DEVICE    2147
-#define MACH_TYPE_STAR9104NAS          2148
-#define MACH_TYPE_PCA100               2149
-#define MACH_TYPE_Z3_DM365_MOD_01      2150
-#define MACH_TYPE_HIPOX                2151
-#define MACH_TYPE_OMAP3_PITEDS         2152
-#define MACH_TYPE_BM150R               2153
-#define MACH_TYPE_TBONE                2154
-#define MACH_TYPE_MERLIN               2155
-#define MACH_TYPE_FALCON               2156
-#define MACH_TYPE_DAVINCI_DA850_EVM    2157
-#define MACH_TYPE_S5P6440              2158
-#define MACH_TYPE_AT91SAM9G10EK        2159
-#define MACH_TYPE_OMAP_4430SDP         2160
-#define MACH_TYPE_LPC313X              2161
-#define MACH_TYPE_MAGX_ZN5             2162
-#define MACH_TYPE_MAGX_EM30            2163
-#define MACH_TYPE_MAGX_VE66            2164
-#define MACH_TYPE_MEESC                2165
-#define MACH_TYPE_OTC570               2166
-#define MACH_TYPE_BCU2412              2167
-#define MACH_TYPE_BEACON               2168
-#define MACH_TYPE_ACTIA_TGW            2169
-#define MACH_TYPE_E4430                2170
-#define MACH_TYPE_QL300                2171
-#define MACH_TYPE_BTMAVB101            2172
-#define MACH_TYPE_BTMAWB101            2173
-#define MACH_TYPE_SQ201                2174
-#define MACH_TYPE_QUATRO45XX           2175
-#define MACH_TYPE_OPENPAD              2176
-#define MACH_TYPE_TX25                 2177
-#define MACH_TYPE_OMAP3_TORPEDO        2178
-#define MACH_TYPE_HTCRAPHAEL_K         2179
-#define MACH_TYPE_LAL43                2181
-#define MACH_TYPE_HTCRAPHAEL_CDMA500   2182
-#define MACH_TYPE_ANW6410              2183
-#define MACH_TYPE_HTCPROPHET           2185
-#define MACH_TYPE_CFA_10022            2186
-#define MACH_TYPE_IMX27_VISSTRIM_M10   2187
-#define MACH_TYPE_PX2IMX27             2188
-#define MACH_TYPE_STM3210E_EVAL        2189
-#define MACH_TYPE_DVS10                2190
-#define MACH_TYPE_PORTUXG20            2191
-#define MACH_TYPE_ARM_SPV              2192
-#define MACH_TYPE_SMDKC110             2193
-#define MACH_TYPE_CABESPRESSO          2194
-#define MACH_TYPE_HMC800               2195
-#define MACH_TYPE_SHOLES               2196
-#define MACH_TYPE_BTMXC31              2197
-#define MACH_TYPE_DT501                2198
-#define MACH_TYPE_KTX                  2199
-#define MACH_TYPE_OMAP3517EVM          2200
-#define MACH_TYPE_NETSPACE_V2          2201
-#define MACH_TYPE_NETSPACE_MAX_V2      2202
-#define MACH_TYPE_D2NET_V2             2203
-#define MACH_TYPE_NET2BIG_V2           2204
-#define MACH_TYPE_NET4BIG_V2           2205
-#define MACH_TYPE_NET5BIG_V2           2206
-#define MACH_TYPE_ENDB2443             2207
-#define MACH_TYPE_INETSPACE_V2         2208
-#define MACH_TYPE_TROS                 2209
-#define MACH_TYPE_PELCO_HOMER          2210
-#define MACH_TYPE_OFSP8                2211
-#define MACH_TYPE_AT91SAM9G45EKES      2212
-#define MACH_TYPE_GUF_CUPID            2213
-#define MACH_TYPE_EAB1R                2214
-#define MACH_TYPE_DESIREC              2215
-#define MACH_TYPE_CORDOBA              2216
-#define MACH_TYPE_IRVINE               2217
-#define MACH_TYPE_SFF772               2218
-#define MACH_TYPE_PELCO_MILANO         2219
-#define MACH_TYPE_PC7302               2220
-#define MACH_TYPE_BIP6000              2221
-#define MACH_TYPE_SILVERMOON           2222
-#define MACH_TYPE_VC0830               2223
-#define MACH_TYPE_DT430                2224
-#define MACH_TYPE_JI42PF               2225
-#define MACH_TYPE_GNET_KSM             2226
-#define MACH_TYPE_GNET_SGM             2227
-#define MACH_TYPE_GNET_SGR             2228
-#define MACH_TYPE_OMAP3_ICETEKEVM      2229
-#define MACH_TYPE_PNP                  2230
-#define MACH_TYPE_CTERA_2BAY_K         2231
-#define MACH_TYPE_CTERA_2BAY_U         2232
-#define MACH_TYPE_SAS_C                2233
-#define MACH_TYPE_VMA2315              2234
-#define MACH_TYPE_VCS                  2235
-#define MACH_TYPE_SPEAR600             2236
-#define MACH_TYPE_SPEAR300             2237
-#define MACH_TYPE_SPEAR1300            2238
-#define MACH_TYPE_LILLY1131            2239
-#define MACH_TYPE_ARVOO_AX301          2240
-#define MACH_TYPE_MAPPHONE             2241
-#define MACH_TYPE_LEGEND               2242
-#define MACH_TYPE_SALSA                2243
-#define MACH_TYPE_LOUNGE               2244
-#define MACH_TYPE_VISION               2245
-#define MACH_TYPE_VMB20                2246
-#define MACH_TYPE_HY2410               2247
-#define MACH_TYPE_HY9315               2248
-#define MACH_TYPE_BULLWINKLE           2249
-#define MACH_TYPE_ARM_ULTIMATOR2       2250
-#define MACH_TYPE_VS_V210              2252
-#define MACH_TYPE_VS_V212              2253
-#define MACH_TYPE_HMT                  2254
-#define MACH_TYPE_SUEN3                2255
-#define MACH_TYPE_VESPER               2256
-#define MACH_TYPE_STR9                 2257
-#define MACH_TYPE_OMAP3_WL_FF          2258
-#define MACH_TYPE_SIMCOM               2259
-#define MACH_TYPE_MCWEBIO              2260
-#define MACH_TYPE_OMAP3_PHRAZER        2261
-#define MACH_TYPE_DARWIN               2262
-#define MACH_TYPE_ORATISCOMU           2263
-#define MACH_TYPE_RTSBC20              2264
-#define MACH_TYPE_I780                 2265
-#define MACH_TYPE_GEMINI324            2266
-#define MACH_TYPE_ORATISLAN            2267
-#define MACH_TYPE_ORATISALOG           2268
-#define MACH_TYPE_ORATISMADI           2269
-#define MACH_TYPE_ORATISOT16           2270
-#define MACH_TYPE_ORATISDESK           2271
-#define MACH_TYPE_V2P_CA9              2272
-#define MACH_TYPE_SINTEXO              2273
-#define MACH_TYPE_CM3389               2274
-#define MACH_TYPE_OMAP3_CIO            2275
-#define MACH_TYPE_SGH_I900             2276
-#define MACH_TYPE_BST100               2277
-#define MACH_TYPE_PASSION              2278
-#define MACH_TYPE_INDESIGN_AT91SAM     2279
-#define MACH_TYPE_C4_BADGER            2280
-#define MACH_TYPE_C4_VIPER             2281
-#define MACH_TYPE_D2NET                2282
-#define MACH_TYPE_BIGDISK              2283
-#define MACH_TYPE_NOTALVISION          2284
-#define MACH_TYPE_OMAP3_KBOC           2285
-#define MACH_TYPE_CYCLONE              2286
-#define MACH_TYPE_NINJA                2287
-#define MACH_TYPE_AT91SAM9G20EK_2MMC   2288
-#define MACH_TYPE_BCMRING              2289
-#define MACH_TYPE_RESOL_DL2            2290
-#define MACH_TYPE_IFOSW                2291
-#define MACH_TYPE_HTCRHODIUM           2292
-#define MACH_TYPE_HTCTOPAZ             2293
-#define MACH_TYPE_MATRIX504            2294
-#define MACH_TYPE_MRFSA                2295
-#define MACH_TYPE_SC_P270              2296
-#define MACH_TYPE_ATLAS5_EVB           2297
-#define MACH_TYPE_PELCO_LOBOX          2298
-#define MACH_TYPE_DILAX_PCU200         2299
-#define MACH_TYPE_LEONARDO             2300
-#define MACH_TYPE_ZORAN_APPROACH7      2301
-#define MACH_TYPE_DP6XX                2302
-#define MACH_TYPE_BCM2153_VESPER       2303
-#define MACH_TYPE_MAHIMAHI             2304
-#define MACH_TYPE_CLICKC               2305
-#define MACH_TYPE_ZB_GATEWAY           2306
-#define MACH_TYPE_TAZCARD              2307
-#define MACH_TYPE_TAZDEV               2308
-#define MACH_TYPE_ANNAX_CB_ARM         2309
-#define MACH_TYPE_ANNAX_DM3            2310
-#define MACH_TYPE_CEREBRIC             2311
-#define MACH_TYPE_ORCA                 2312
-#define MACH_TYPE_PC9260               2313
-#define MACH_TYPE_EMS285A              2314
-#define MACH_TYPE_GEC2410              2315
-#define MACH_TYPE_GEC2440              2316
-#define MACH_TYPE_ARCH_MW903           2317
-#define MACH_TYPE_MW2440               2318
-#define MACH_TYPE_ECAC2378             2319
-#define MACH_TYPE_TAZKIOSK             2320
-#define MACH_TYPE_WHITERABBIT_MCH      2321
-#define MACH_TYPE_SBOX9263             2322
-#define MACH_TYPE_OREO                 2323
-#define MACH_TYPE_SMDK6442             2324
-#define MACH_TYPE_OPENRD_BASE          2325
-#define MACH_TYPE_INCREDIBLE           2326
-#define MACH_TYPE_INCREDIBLEC          2327
-#define MACH_TYPE_HEROCT               2328
-#define MACH_TYPE_MMNET1000            2329
-#define MACH_TYPE_DEVKIT8000           2330
-#define MACH_TYPE_DEVKIT9000           2331
-#define MACH_TYPE_MX31TXTR             2332
-#define MACH_TYPE_U380                 2333
-#define MACH_TYPE_HUALU_BOARD          2334
-#define MACH_TYPE_NPCMX50              2335
-#define MACH_TYPE_MX51_LANGE51         2336
-#define MACH_TYPE_MX51_LANGE52         2337
-#define MACH_TYPE_RIOM                 2338
-#define MACH_TYPE_COMCAS               2339
-#define MACH_TYPE_WSI_MX27             2340
-#define MACH_TYPE_CM_T35               2341
-#define MACH_TYPE_NET2BIG              2342
-#define MACH_TYPE_MOTOROLA_A1600       2343
-#define MACH_TYPE_IGEP0020             2344
-#define MACH_TYPE_IGEP0010             2345
-#define MACH_TYPE_MV6281GTWGE2         2346
-#define MACH_TYPE_SCAT100              2347
-#define MACH_TYPE_SANMINA              2348
-#define MACH_TYPE_MOMENTO              2349
-#define MACH_TYPE_NUC9XX               2350
-#define MACH_TYPE_NUC910EVB            2351
-#define MACH_TYPE_NUC920EVB            2352
-#define MACH_TYPE_NUC950EVB            2353
-#define MACH_TYPE_NUC945EVB            2354
-#define MACH_TYPE_NUC960EVB            2355
-#define MACH_TYPE_NUC932EVB            2356
-#define MACH_TYPE_NUC900               2357
-#define MACH_TYPE_SD1SOC               2358
-#define MACH_TYPE_LN2440BC             2359
-#define MACH_TYPE_RSBC                 2360
-#define MACH_TYPE_OPENRD_CLIENT        2361
-#define MACH_TYPE_HPIPAQ11X            2362
-#define MACH_TYPE_WAYLAND              2363
-#define MACH_TYPE_ACNBSX102            2364
-#define MACH_TYPE_HWAT91               2365
-#define MACH_TYPE_AT91SAM9263CS        2366
-#define MACH_TYPE_CSB732               2367
-#define MACH_TYPE_U8500                2368
-#define MACH_TYPE_HUQIU                2369
-#define MACH_TYPE_MX51_KUNLUN          2370
-#define MACH_TYPE_PMT1G                2371
-#define MACH_TYPE_HTCELF               2372
-#define MACH_TYPE_ARMADILLO420         2373
-#define MACH_TYPE_ARMADILLO440         2374
-#define MACH_TYPE_U_CHIP_DUAL_ARM      2375
-#define MACH_TYPE_CSR_BDB3             2376
-#define MACH_TYPE_DOLBY_CAT1018        2377
-#define MACH_TYPE_HY9307               2378
-#define MACH_TYPE_A_ES                 2379
-#define MACH_TYPE_DAVINCI_IRIF         2380
-#define MACH_TYPE_AGAMA9263            2381
-#define MACH_TYPE_MARVELL_JASPER       2382
-#define MACH_TYPE_FLINT                2383
-#define MACH_TYPE_TAVOREVB3            2384
-#define MACH_TYPE_SCH_M490             2386
-#define MACH_TYPE_RBL01                2387
-#define MACH_TYPE_OMNIFI               2388
-#define MACH_TYPE_OTAVALO              2389
-#define MACH_TYPE_SIENNA               2390
-#define MACH_TYPE_HTC_EXCALIBUR_S620   2391
-#define MACH_TYPE_HTC_OPAL             2392
-#define MACH_TYPE_TOUCHBOOK            2393
-#define MACH_TYPE_LATTE                2394
-#define MACH_TYPE_XA200                2395
-#define MACH_TYPE_NIMROD               2396
-#define MACH_TYPE_CC9P9215_3G          2397
-#define MACH_TYPE_CC9P9215_3GJS        2398
-#define MACH_TYPE_TK71                 2399
-#define MACH_TYPE_COMHAM3525           2400
-#define MACH_TYPE_MX31EREBUS           2401
-#define MACH_TYPE_MCARDMX27            2402
-#define MACH_TYPE_PARADISE             2403
-#define MACH_TYPE_TIDE                 2404
-#define MACH_TYPE_WZL2440              2405
-#define MACH_TYPE_SDRDEMO              2406
-#define MACH_TYPE_ETHERCAN2            2407
-#define MACH_TYPE_ECMIMG20             2408
-#define MACH_TYPE_OMAP_DRAGON          2409
-#define MACH_TYPE_HALO                 2410
-#define MACH_TYPE_HUANGSHAN            2411
-#define MACH_TYPE_VL_MA2SC             2412
-#define MACH_TYPE_RAUMFELD_RC          2413
-#define MACH_TYPE_RAUMFELD_CONNECTOR   2414
-#define MACH_TYPE_RAUMFELD_SPEAKER     2415
-#define MACH_TYPE_MULTIBUS_MASTER      2416
-#define MACH_TYPE_MULTIBUS_PBK         2417
-#define MACH_TYPE_TNETV107X            2418
-#define MACH_TYPE_SNAKE                2419
-#define MACH_TYPE_CWMX27               2420
-#define MACH_TYPE_SCH_M480             2421
-#define MACH_TYPE_PLATYPUS             2422
-#define MACH_TYPE_PSS2                 2423
-#define MACH_TYPE_DAVINCI_APM150       2424
-#define MACH_TYPE_STR9100              2425
-#define MACH_TYPE_NET5BIG              2426
-#define MACH_TYPE_SEABED9263           2427
-#define MACH_TYPE_MX51_M2ID            2428
-#define MACH_TYPE_OCTVOCPLUS_EB        2429
-#define MACH_TYPE_KLK_FIREFOX          2430
-#define MACH_TYPE_KLK_WIRMA_MODULE     2431
-#define MACH_TYPE_KLK_WIRMA_MMI        2432
-#define MACH_TYPE_SUPERSONIC           2433
-#define MACH_TYPE_LIBERTY              2434
-#define MACH_TYPE_MH355                2435
-#define MACH_TYPE_PC7802               2436
-#define MACH_TYPE_GNET_SGC             2437
-#define MACH_TYPE_EINSTEIN15           2438
-#define MACH_TYPE_CMPD                 2439
-#define MACH_TYPE_DAVINCI_HASE1        2440
-#define MACH_TYPE_LGEINCITEPHONE       2441
-#define MACH_TYPE_EA313X               2442
-#define MACH_TYPE_FWBD_39064           2443
-#define MACH_TYPE_FWBD_390128          2444
-#define MACH_TYPE_PELCO_MOE            2445
-#define MACH_TYPE_MINIMIX27            2446
-#define MACH_TYPE_OMAP3_THUNDER        2447
-#define MACH_TYPE_PASSIONC             2448
-
-#ifdef CONFIG_ARCH_EBSA110
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EBSA110
-# endif
-# define machine_is_ebsa110()	(machine_arch_type == MACH_TYPE_EBSA110)
-#else
-# define machine_is_ebsa110()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_RPC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RISCPC
-# endif
-# define machine_is_riscpc()	(machine_arch_type == MACH_TYPE_RISCPC)
-#else
-# define machine_is_riscpc()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_NEXUSPCI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NEXUSPCI
-# endif
-# define machine_is_nexuspci()	(machine_arch_type == MACH_TYPE_NEXUSPCI)
-#else
-# define machine_is_nexuspci()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_EBSA285
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EBSA285
-# endif
-# define machine_is_ebsa285()	(machine_arch_type == MACH_TYPE_EBSA285)
-#else
-# define machine_is_ebsa285()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_NETWINDER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NETWINDER
-# endif
-# define machine_is_netwinder()	(machine_arch_type == MACH_TYPE_NETWINDER)
-#else
-# define machine_is_netwinder()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_CATS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CATS
-# endif
-# define machine_is_cats()	(machine_arch_type == MACH_TYPE_CATS)
-#else
-# define machine_is_cats()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_TBOX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TBOX
-# endif
-# define machine_is_tbox()	(machine_arch_type == MACH_TYPE_TBOX)
-#else
-# define machine_is_tbox()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_CO285
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CO285
-# endif
-# define machine_is_co285()	(machine_arch_type == MACH_TYPE_CO285)
-#else
-# define machine_is_co285()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_CLPS7110
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CLPS7110
-# endif
-# define machine_is_clps7110()	(machine_arch_type == MACH_TYPE_CLPS7110)
-#else
-# define machine_is_clps7110()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ARC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARCHIMEDES
-# endif
-# define machine_is_archimedes()	(machine_arch_type == MACH_TYPE_ARCHIMEDES)
-#else
-# define machine_is_archimedes()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_A5K
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_A5K
-# endif
-# define machine_is_a5k()	(machine_arch_type == MACH_TYPE_A5K)
-#else
-# define machine_is_a5k()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ETOILE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ETOILE
-# endif
-# define machine_is_etoile()	(machine_arch_type == MACH_TYPE_ETOILE)
-#else
-# define machine_is_etoile()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_LACIE_NAS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LACIE_NAS
-# endif
-# define machine_is_lacie_nas()	(machine_arch_type == MACH_TYPE_LACIE_NAS)
-#else
-# define machine_is_lacie_nas()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_CLPS7500
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CLPS7500
-# endif
-# define machine_is_clps7500()	(machine_arch_type == MACH_TYPE_CLPS7500)
-#else
-# define machine_is_clps7500()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_SHARK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SHARK
-# endif
-# define machine_is_shark()	(machine_arch_type == MACH_TYPE_SHARK)
-#else
-# define machine_is_shark()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_BRUTUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BRUTUS
-# endif
-# define machine_is_brutus()	(machine_arch_type == MACH_TYPE_BRUTUS)
-#else
-# define machine_is_brutus()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PERSONAL_SERVER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PERSONAL_SERVER
-# endif
-# define machine_is_personal_server()	(machine_arch_type == MACH_TYPE_PERSONAL_SERVER)
-#else
-# define machine_is_personal_server()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_ITSY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ITSY
-# endif
-# define machine_is_itsy()	(machine_arch_type == MACH_TYPE_ITSY)
-#else
-# define machine_is_itsy()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_L7200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_L7200
-# endif
-# define machine_is_l7200()	(machine_arch_type == MACH_TYPE_L7200)
-#else
-# define machine_is_l7200()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_PLEB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PLEB
-# endif
-# define machine_is_pleb()	(machine_arch_type == MACH_TYPE_PLEB)
-#else
-# define machine_is_pleb()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_INTEGRATOR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_INTEGRATOR
-# endif
-# define machine_is_integrator()	(machine_arch_type == MACH_TYPE_INTEGRATOR)
-#else
-# define machine_is_integrator()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_H3600
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_H3600
-# endif
-# define machine_is_h3600()	(machine_arch_type == MACH_TYPE_H3600)
-#else
-# define machine_is_h3600()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IXP1200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXP1200
-# endif
-# define machine_is_ixp1200()	(machine_arch_type == MACH_TYPE_IXP1200)
-#else
-# define machine_is_ixp1200()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_P720T
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_P720T
-# endif
-# define machine_is_p720t()	(machine_arch_type == MACH_TYPE_P720T)
-#else
-# define machine_is_p720t()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_ASSABET
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ASSABET
-# endif
-# define machine_is_assabet()	(machine_arch_type == MACH_TYPE_ASSABET)
-#else
-# define machine_is_assabet()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_VICTOR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VICTOR
-# endif
-# define machine_is_victor()	(machine_arch_type == MACH_TYPE_VICTOR)
-#else
-# define machine_is_victor()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_LART
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LART
-# endif
-# define machine_is_lart()	(machine_arch_type == MACH_TYPE_LART)
-#else
-# define machine_is_lart()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_RANGER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RANGER
-# endif
-# define machine_is_ranger()	(machine_arch_type == MACH_TYPE_RANGER)
-#else
-# define machine_is_ranger()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_GRAPHICSCLIENT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GRAPHICSCLIENT
-# endif
-# define machine_is_graphicsclient()	(machine_arch_type == MACH_TYPE_GRAPHICSCLIENT)
-#else
-# define machine_is_graphicsclient()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_XP860
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XP860
-# endif
-# define machine_is_xp860()	(machine_arch_type == MACH_TYPE_XP860)
-#else
-# define machine_is_xp860()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_CERF
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CERF
-# endif
-# define machine_is_cerf()	(machine_arch_type == MACH_TYPE_CERF)
-#else
-# define machine_is_cerf()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_NANOENGINE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NANOENGINE
-# endif
-# define machine_is_nanoengine()	(machine_arch_type == MACH_TYPE_NANOENGINE)
-#else
-# define machine_is_nanoengine()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_FPIC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FPIC
-# endif
-# define machine_is_fpic()	(machine_arch_type == MACH_TYPE_FPIC)
-#else
-# define machine_is_fpic()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_EXTENEX1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EXTENEX1
-# endif
-# define machine_is_extenex1()	(machine_arch_type == MACH_TYPE_EXTENEX1)
-#else
-# define machine_is_extenex1()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_SHERMAN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SHERMAN
-# endif
-# define machine_is_sherman()	(machine_arch_type == MACH_TYPE_SHERMAN)
-#else
-# define machine_is_sherman()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_ACCELENT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ACCELENT_SA
-# endif
-# define machine_is_accelent_sa()	(machine_arch_type == MACH_TYPE_ACCELENT_SA)
-#else
-# define machine_is_accelent_sa()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_L7200_ACCELENT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ACCELENT_L7200
-# endif
-# define machine_is_accelent_l7200()	(machine_arch_type == MACH_TYPE_ACCELENT_L7200)
-#else
-# define machine_is_accelent_l7200()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_NETPORT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NETPORT
-# endif
-# define machine_is_netport()	(machine_arch_type == MACH_TYPE_NETPORT)
-#else
-# define machine_is_netport()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_PANGOLIN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PANGOLIN
-# endif
-# define machine_is_pangolin()	(machine_arch_type == MACH_TYPE_PANGOLIN)
-#else
-# define machine_is_pangolin()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_YOPY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_YOPY
-# endif
-# define machine_is_yopy()	(machine_arch_type == MACH_TYPE_YOPY)
-#else
-# define machine_is_yopy()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_COOLIDGE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_COOLIDGE
-# endif
-# define machine_is_coolidge()	(machine_arch_type == MACH_TYPE_COOLIDGE)
-#else
-# define machine_is_coolidge()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_HUW_WEBPANEL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HUW_WEBPANEL
-# endif
-# define machine_is_huw_webpanel()	(machine_arch_type == MACH_TYPE_HUW_WEBPANEL)
-#else
-# define machine_is_huw_webpanel()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_SPOTME
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SPOTME
-# endif
-# define machine_is_spotme()	(machine_arch_type == MACH_TYPE_SPOTME)
-#else
-# define machine_is_spotme()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_FREEBIRD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FREEBIRD
-# endif
-# define machine_is_freebird()	(machine_arch_type == MACH_TYPE_FREEBIRD)
-#else
-# define machine_is_freebird()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_TI925
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TI925
-# endif
-# define machine_is_ti925()	(machine_arch_type == MACH_TYPE_TI925)
-#else
-# define machine_is_ti925()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_RISCSTATION
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RISCSTATION
-# endif
-# define machine_is_riscstation()	(machine_arch_type == MACH_TYPE_RISCSTATION)
-#else
-# define machine_is_riscstation()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_CAVY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CAVY
-# endif
-# define machine_is_cavy()	(machine_arch_type == MACH_TYPE_CAVY)
-#else
-# define machine_is_cavy()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_JORNADA720
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_JORNADA720
-# endif
-# define machine_is_jornada720()	(machine_arch_type == MACH_TYPE_JORNADA720)
-#else
-# define machine_is_jornada720()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_OMNIMETER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMNIMETER
-# endif
-# define machine_is_omnimeter()	(machine_arch_type == MACH_TYPE_OMNIMETER)
-#else
-# define machine_is_omnimeter()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_EDB7211
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EDB7211
-# endif
-# define machine_is_edb7211()	(machine_arch_type == MACH_TYPE_EDB7211)
-#else
-# define machine_is_edb7211()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_CITYGO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CITYGO
-# endif
-# define machine_is_citygo()	(machine_arch_type == MACH_TYPE_CITYGO)
-#else
-# define machine_is_citygo()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_PFS168
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PFS168
-# endif
-# define machine_is_pfs168()	(machine_arch_type == MACH_TYPE_PFS168)
-#else
-# define machine_is_pfs168()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_SPOT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SPOT
-# endif
-# define machine_is_spot()	(machine_arch_type == MACH_TYPE_SPOT)
-#else
-# define machine_is_spot()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_FLEXANET
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FLEXANET
-# endif
-# define machine_is_flexanet()	(machine_arch_type == MACH_TYPE_FLEXANET)
-#else
-# define machine_is_flexanet()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_WEBPAL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WEBPAL
-# endif
-# define machine_is_webpal()	(machine_arch_type == MACH_TYPE_WEBPAL)
-#else
-# define machine_is_webpal()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_LINPDA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LINPDA
-# endif
-# define machine_is_linpda()	(machine_arch_type == MACH_TYPE_LINPDA)
-#else
-# define machine_is_linpda()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ANAKIN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ANAKIN
-# endif
-# define machine_is_anakin()	(machine_arch_type == MACH_TYPE_ANAKIN)
-#else
-# define machine_is_anakin()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_MVI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MVI
-# endif
-# define machine_is_mvi()	(machine_arch_type == MACH_TYPE_MVI)
-#else
-# define machine_is_mvi()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_JUPITER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_JUPITER
-# endif
-# define machine_is_jupiter()	(machine_arch_type == MACH_TYPE_JUPITER)
-#else
-# define machine_is_jupiter()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PSIONW
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PSIONW
-# endif
-# define machine_is_psionw()	(machine_arch_type == MACH_TYPE_PSIONW)
-#else
-# define machine_is_psionw()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_ALN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ALN
-# endif
-# define machine_is_aln()	(machine_arch_type == MACH_TYPE_ALN)
-#else
-# define machine_is_aln()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_CAMELOT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CAMELOT
-# endif
-# define machine_is_epxa()	(machine_arch_type == MACH_TYPE_CAMELOT)
-#else
-# define machine_is_epxa()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_GDS2200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GDS2200
-# endif
-# define machine_is_gds2200()	(machine_arch_type == MACH_TYPE_GDS2200)
-#else
-# define machine_is_gds2200()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_PSION_SERIES7
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PSION_SERIES7
-# endif
-# define machine_is_netbook()	(machine_arch_type == MACH_TYPE_PSION_SERIES7)
-#else
-# define machine_is_netbook()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_XFILE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XFILE
-# endif
-# define machine_is_xfile()	(machine_arch_type == MACH_TYPE_XFILE)
-#else
-# define machine_is_xfile()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ACCELENT_EP9312
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ACCELENT_EP9312
-# endif
-# define machine_is_accelent_ep9312()	(machine_arch_type == MACH_TYPE_ACCELENT_EP9312)
-#else
-# define machine_is_accelent_ep9312()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IC200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IC200
-# endif
-# define machine_is_ic200()	(machine_arch_type == MACH_TYPE_IC200)
-#else
-# define machine_is_ic200()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_CREDITLART
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CREDITLART
-# endif
-# define machine_is_creditlart()	(machine_arch_type == MACH_TYPE_CREDITLART)
-#else
-# define machine_is_creditlart()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_HTM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTM
-# endif
-# define machine_is_htm()	(machine_arch_type == MACH_TYPE_HTM)
-#else
-# define machine_is_htm()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IQ80310
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IQ80310
-# endif
-# define machine_is_iq80310()	(machine_arch_type == MACH_TYPE_IQ80310)
-#else
-# define machine_is_iq80310()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_FREEBOT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FREEBOT
-# endif
-# define machine_is_freebot()	(machine_arch_type == MACH_TYPE_FREEBOT)
-#else
-# define machine_is_freebot()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ENTEL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ENTEL
-# endif
-# define machine_is_entel()	(machine_arch_type == MACH_TYPE_ENTEL)
-#else
-# define machine_is_entel()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ENP3510
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ENP3510
-# endif
-# define machine_is_enp3510()	(machine_arch_type == MACH_TYPE_ENP3510)
-#else
-# define machine_is_enp3510()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_TRIZEPS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TRIZEPS
-# endif
-# define machine_is_trizeps()	(machine_arch_type == MACH_TYPE_TRIZEPS)
-#else
-# define machine_is_trizeps()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_NESA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NESA
-# endif
-# define machine_is_nesa()	(machine_arch_type == MACH_TYPE_NESA)
-#else
-# define machine_is_nesa()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_VENUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VENUS
-# endif
-# define machine_is_venus()	(machine_arch_type == MACH_TYPE_VENUS)
-#else
-# define machine_is_venus()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_TARDIS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TARDIS
-# endif
-# define machine_is_tardis()	(machine_arch_type == MACH_TYPE_TARDIS)
-#else
-# define machine_is_tardis()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_MERCURY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MERCURY
-# endif
-# define machine_is_mercury()	(machine_arch_type == MACH_TYPE_MERCURY)
-#else
-# define machine_is_mercury()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_EMPEG
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EMPEG
-# endif
-# define machine_is_empeg()	(machine_arch_type == MACH_TYPE_EMPEG)
-#else
-# define machine_is_empeg()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_I80200FCC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_I80200FCC
-# endif
-# define machine_is_adi_evb()	(machine_arch_type == MACH_TYPE_I80200FCC)
-#else
-# define machine_is_adi_evb()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_ITT_CPB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ITT_CPB
-# endif
-# define machine_is_itt_cpb()	(machine_arch_type == MACH_TYPE_ITT_CPB)
-#else
-# define machine_is_itt_cpb()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_SVC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SVC
-# endif
-# define machine_is_svc()	(machine_arch_type == MACH_TYPE_SVC)
-#else
-# define machine_is_svc()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_ALPHA2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ALPHA2
-# endif
-# define machine_is_alpha2()	(machine_arch_type == MACH_TYPE_ALPHA2)
-#else
-# define machine_is_alpha2()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_ALPHA1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ALPHA1
-# endif
-# define machine_is_alpha1()	(machine_arch_type == MACH_TYPE_ALPHA1)
-#else
-# define machine_is_alpha1()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_NETARM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NETARM
-# endif
-# define machine_is_netarm()	(machine_arch_type == MACH_TYPE_NETARM)
-#else
-# define machine_is_netarm()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_SIMPAD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SIMPAD
-# endif
-# define machine_is_simpad()	(machine_arch_type == MACH_TYPE_SIMPAD)
-#else
-# define machine_is_simpad()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PDA1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PDA1
-# endif
-# define machine_is_pda1()	(machine_arch_type == MACH_TYPE_PDA1)
-#else
-# define machine_is_pda1()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_LUBBOCK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LUBBOCK
-# endif
-# define machine_is_lubbock()	(machine_arch_type == MACH_TYPE_LUBBOCK)
-#else
-# define machine_is_lubbock()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ANIKO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ANIKO
-# endif
-# define machine_is_aniko()	(machine_arch_type == MACH_TYPE_ANIKO)
-#else
-# define machine_is_aniko()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_CLEP7212
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CLEP7212
-# endif
-# define machine_is_clep7212()	(machine_arch_type == MACH_TYPE_CLEP7212)
-#else
-# define machine_is_clep7212()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_CS89712
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CS89712
-# endif
-# define machine_is_cs89712()	(machine_arch_type == MACH_TYPE_CS89712)
-#else
-# define machine_is_cs89712()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_WEARARM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WEARARM
-# endif
-# define machine_is_weararm()	(machine_arch_type == MACH_TYPE_WEARARM)
-#else
-# define machine_is_weararm()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_POSSIO_PX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_POSSIO_PX
-# endif
-# define machine_is_possio_px()	(machine_arch_type == MACH_TYPE_POSSIO_PX)
-#else
-# define machine_is_possio_px()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_SIDEARM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SIDEARM
-# endif
-# define machine_is_sidearm()	(machine_arch_type == MACH_TYPE_SIDEARM)
-#else
-# define machine_is_sidearm()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_STORK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STORK
-# endif
-# define machine_is_stork()	(machine_arch_type == MACH_TYPE_STORK)
-#else
-# define machine_is_stork()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_SHANNON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SHANNON
-# endif
-# define machine_is_shannon()	(machine_arch_type == MACH_TYPE_SHANNON)
-#else
-# define machine_is_shannon()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ACE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ACE
-# endif
-# define machine_is_ace()	(machine_arch_type == MACH_TYPE_ACE)
-#else
-# define machine_is_ace()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_BALLYARM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BALLYARM
-# endif
-# define machine_is_ballyarm()	(machine_arch_type == MACH_TYPE_BALLYARM)
-#else
-# define machine_is_ballyarm()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_SIMPUTER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SIMPUTER
-# endif
-# define machine_is_simputer()	(machine_arch_type == MACH_TYPE_SIMPUTER)
-#else
-# define machine_is_simputer()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_NEXTERM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NEXTERM
-# endif
-# define machine_is_nexterm()	(machine_arch_type == MACH_TYPE_NEXTERM)
-#else
-# define machine_is_nexterm()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_SA1100_ELF
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SA1100_ELF
-# endif
-# define machine_is_sa1100_elf()	(machine_arch_type == MACH_TYPE_SA1100_ELF)
-#else
-# define machine_is_sa1100_elf()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_GATOR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GATOR
-# endif
-# define machine_is_gator()	(machine_arch_type == MACH_TYPE_GATOR)
-#else
-# define machine_is_gator()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_GRANITE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GRANITE
-# endif
-# define machine_is_granite()	(machine_arch_type == MACH_TYPE_GRANITE)
-#else
-# define machine_is_granite()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_CONSUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CONSUS
-# endif
-# define machine_is_consus()	(machine_arch_type == MACH_TYPE_CONSUS)
-#else
-# define machine_is_consus()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_AAED2000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AAED2000
-# endif
-# define machine_is_aaed2000()	(machine_arch_type == MACH_TYPE_AAED2000)
-#else
-# define machine_is_aaed2000()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_CDB89712
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CDB89712
-# endif
-# define machine_is_cdb89712()	(machine_arch_type == MACH_TYPE_CDB89712)
-#else
-# define machine_is_cdb89712()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_GRAPHICSMASTER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GRAPHICSMASTER
-# endif
-# define machine_is_graphicsmaster()	(machine_arch_type == MACH_TYPE_GRAPHICSMASTER)
-#else
-# define machine_is_graphicsmaster()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_ADSBITSY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADSBITSY
-# endif
-# define machine_is_adsbitsy()	(machine_arch_type == MACH_TYPE_ADSBITSY)
-#else
-# define machine_is_adsbitsy()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PXA_IDP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXA_IDP
-# endif
-# define machine_is_pxa_idp()	(machine_arch_type == MACH_TYPE_PXA_IDP)
-#else
-# define machine_is_pxa_idp()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PLCE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PLCE
-# endif
-# define machine_is_plce()	(machine_arch_type == MACH_TYPE_PLCE)
-#else
-# define machine_is_plce()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_PT_SYSTEM3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PT_SYSTEM3
-# endif
-# define machine_is_pt_system3()	(machine_arch_type == MACH_TYPE_PT_SYSTEM3)
-#else
-# define machine_is_pt_system3()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_MEDALB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MEDALB
-# endif
-# define machine_is_murphy()	(machine_arch_type == MACH_TYPE_MEDALB)
-#else
-# define machine_is_murphy()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_EAGLE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EAGLE
-# endif
-# define machine_is_eagle()	(machine_arch_type == MACH_TYPE_EAGLE)
-#else
-# define machine_is_eagle()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_DSC21
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DSC21
-# endif
-# define machine_is_dsc21()	(machine_arch_type == MACH_TYPE_DSC21)
-#else
-# define machine_is_dsc21()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_DSC24
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DSC24
-# endif
-# define machine_is_dsc24()	(machine_arch_type == MACH_TYPE_DSC24)
-#else
-# define machine_is_dsc24()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_TI5472
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TI5472
-# endif
-# define machine_is_ti5472()	(machine_arch_type == MACH_TYPE_TI5472)
-#else
-# define machine_is_ti5472()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_AUTCPU12
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AUTCPU12
-# endif
-# define machine_is_autcpu12()	(machine_arch_type == MACH_TYPE_AUTCPU12)
-#else
-# define machine_is_autcpu12()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_UENGINE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UENGINE
-# endif
-# define machine_is_uengine()	(machine_arch_type == MACH_TYPE_UENGINE)
-#else
-# define machine_is_uengine()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_BLUESTEM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BLUESTEM
-# endif
-# define machine_is_bluestem()	(machine_arch_type == MACH_TYPE_BLUESTEM)
-#else
-# define machine_is_bluestem()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_XINGU8
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XINGU8
-# endif
-# define machine_is_xingu8()	(machine_arch_type == MACH_TYPE_XINGU8)
-#else
-# define machine_is_xingu8()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_BUSHSTB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BUSHSTB
-# endif
-# define machine_is_bushstb()	(machine_arch_type == MACH_TYPE_BUSHSTB)
-#else
-# define machine_is_bushstb()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_EPSILON1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EPSILON1
-# endif
-# define machine_is_epsilon1()	(machine_arch_type == MACH_TYPE_EPSILON1)
-#else
-# define machine_is_epsilon1()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_BALLOON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BALLOON
-# endif
-# define machine_is_balloon()	(machine_arch_type == MACH_TYPE_BALLOON)
-#else
-# define machine_is_balloon()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PUPPY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PUPPY
-# endif
-# define machine_is_puppy()	(machine_arch_type == MACH_TYPE_PUPPY)
-#else
-# define machine_is_puppy()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_ELROY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ELROY
-# endif
-# define machine_is_elroy()	(machine_arch_type == MACH_TYPE_ELROY)
-#else
-# define machine_is_elroy()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_GMS720
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GMS720
-# endif
-# define machine_is_gms720()	(machine_arch_type == MACH_TYPE_GMS720)
-#else
-# define machine_is_gms720()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_S24X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S24X
-# endif
-# define machine_is_s24x()	(machine_arch_type == MACH_TYPE_S24X)
-#else
-# define machine_is_s24x()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_JTEL_CLEP7312
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_JTEL_CLEP7312
-# endif
-# define machine_is_jtel_clep7312()	(machine_arch_type == MACH_TYPE_JTEL_CLEP7312)
-#else
-# define machine_is_jtel_clep7312()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_CX821XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CX821XX
-# endif
-# define machine_is_cx821xx()	(machine_arch_type == MACH_TYPE_CX821XX)
-#else
-# define machine_is_cx821xx()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_EDB7312
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EDB7312
-# endif
-# define machine_is_edb7312()	(machine_arch_type == MACH_TYPE_EDB7312)
-#else
-# define machine_is_edb7312()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_BSA1110
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BSA1110
-# endif
-# define machine_is_bsa1110()	(machine_arch_type == MACH_TYPE_BSA1110)
-#else
-# define machine_is_bsa1110()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_POWERPIN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_POWERPIN
-# endif
-# define machine_is_powerpin()	(machine_arch_type == MACH_TYPE_POWERPIN)
-#else
-# define machine_is_powerpin()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_OPENARM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OPENARM
-# endif
-# define machine_is_openarm()	(machine_arch_type == MACH_TYPE_OPENARM)
-#else
-# define machine_is_openarm()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_WHITECHAPEL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WHITECHAPEL
-# endif
-# define machine_is_whitechapel()	(machine_arch_type == MACH_TYPE_WHITECHAPEL)
-#else
-# define machine_is_whitechapel()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_H3100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_H3100
-# endif
-# define machine_is_h3100()	(machine_arch_type == MACH_TYPE_H3100)
-#else
-# define machine_is_h3100()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_H3800
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_H3800
-# endif
-# define machine_is_h3800()	(machine_arch_type == MACH_TYPE_H3800)
-#else
-# define machine_is_h3800()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_BLUE_V1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BLUE_V1
-# endif
-# define machine_is_blue_v1()	(machine_arch_type == MACH_TYPE_BLUE_V1)
-#else
-# define machine_is_blue_v1()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PXA_CERF
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXA_CERF
-# endif
-# define machine_is_pxa_cerf()	(machine_arch_type == MACH_TYPE_PXA_CERF)
-#else
-# define machine_is_pxa_cerf()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ARM7TEVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARM7TEVB
-# endif
-# define machine_is_arm7tevb()	(machine_arch_type == MACH_TYPE_ARM7TEVB)
-#else
-# define machine_is_arm7tevb()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_D7400
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_D7400
-# endif
-# define machine_is_d7400()	(machine_arch_type == MACH_TYPE_D7400)
-#else
-# define machine_is_d7400()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PIRANHA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PIRANHA
-# endif
-# define machine_is_piranha()	(machine_arch_type == MACH_TYPE_PIRANHA)
-#else
-# define machine_is_piranha()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_SBCAMELOT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SBCAMELOT
-# endif
-# define machine_is_sbcamelot()	(machine_arch_type == MACH_TYPE_SBCAMELOT)
-#else
-# define machine_is_sbcamelot()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_KINGS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KINGS
-# endif
-# define machine_is_kings()	(machine_arch_type == MACH_TYPE_KINGS)
-#else
-# define machine_is_kings()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_SMDK2400
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMDK2400
-# endif
-# define machine_is_smdk2400()	(machine_arch_type == MACH_TYPE_SMDK2400)
-#else
-# define machine_is_smdk2400()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_COLLIE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_COLLIE
-# endif
-# define machine_is_collie()	(machine_arch_type == MACH_TYPE_COLLIE)
-#else
-# define machine_is_collie()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IDR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IDR
-# endif
-# define machine_is_idr()	(machine_arch_type == MACH_TYPE_IDR)
-#else
-# define machine_is_idr()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_BADGE4
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BADGE4
-# endif
-# define machine_is_badge4()	(machine_arch_type == MACH_TYPE_BADGE4)
-#else
-# define machine_is_badge4()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_WEBNET
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WEBNET
-# endif
-# define machine_is_webnet()	(machine_arch_type == MACH_TYPE_WEBNET)
-#else
-# define machine_is_webnet()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_D7300
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_D7300
-# endif
-# define machine_is_d7300()	(machine_arch_type == MACH_TYPE_D7300)
-#else
-# define machine_is_d7300()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_CEP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CEP
-# endif
-# define machine_is_cep()	(machine_arch_type == MACH_TYPE_CEP)
-#else
-# define machine_is_cep()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_FORTUNET
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FORTUNET
-# endif
-# define machine_is_fortunet()	(machine_arch_type == MACH_TYPE_FORTUNET)
-#else
-# define machine_is_fortunet()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_VC547X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VC547X
-# endif
-# define machine_is_vc547x()	(machine_arch_type == MACH_TYPE_VC547X)
-#else
-# define machine_is_vc547x()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_FILEWALKER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FILEWALKER
-# endif
-# define machine_is_filewalker()	(machine_arch_type == MACH_TYPE_FILEWALKER)
-#else
-# define machine_is_filewalker()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_NETGATEWAY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NETGATEWAY
-# endif
-# define machine_is_netgateway()	(machine_arch_type == MACH_TYPE_NETGATEWAY)
-#else
-# define machine_is_netgateway()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_SYMBOL2800
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SYMBOL2800
-# endif
-# define machine_is_symbol2800()	(machine_arch_type == MACH_TYPE_SYMBOL2800)
-#else
-# define machine_is_symbol2800()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_SUNS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SUNS
-# endif
-# define machine_is_suns()	(machine_arch_type == MACH_TYPE_SUNS)
-#else
-# define machine_is_suns()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_FRODO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FRODO
-# endif
-# define machine_is_frodo()	(machine_arch_type == MACH_TYPE_FRODO)
-#else
-# define machine_is_frodo()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_MACH_TYTE_MS301
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MACH_TYTE_MS301
-# endif
-# define machine_is_ms301()	(machine_arch_type == MACH_TYPE_MACH_TYTE_MS301)
-#else
-# define machine_is_ms301()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_MX1ADS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX1ADS
-# endif
-# define machine_is_mx1ads()	(machine_arch_type == MACH_TYPE_MX1ADS)
-#else
-# define machine_is_mx1ads()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_H7201
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_H7201
-# endif
-# define machine_is_h7201()	(machine_arch_type == MACH_TYPE_H7201)
-#else
-# define machine_is_h7201()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_H7202
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_H7202
-# endif
-# define machine_is_h7202()	(machine_arch_type == MACH_TYPE_H7202)
-#else
-# define machine_is_h7202()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_AMICO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AMICO
-# endif
-# define machine_is_amico()	(machine_arch_type == MACH_TYPE_AMICO)
-#else
-# define machine_is_amico()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_IAM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IAM
-# endif
-# define machine_is_iam()	(machine_arch_type == MACH_TYPE_IAM)
-#else
-# define machine_is_iam()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_TT530
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TT530
-# endif
-# define machine_is_tt530()	(machine_arch_type == MACH_TYPE_TT530)
-#else
-# define machine_is_tt530()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_SAM2400
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SAM2400
-# endif
-# define machine_is_sam2400()	(machine_arch_type == MACH_TYPE_SAM2400)
-#else
-# define machine_is_sam2400()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_JORNADA56X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_JORNADA56X
-# endif
-# define machine_is_jornada56x()	(machine_arch_type == MACH_TYPE_JORNADA56X)
-#else
-# define machine_is_jornada56x()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_ACTIVE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ACTIVE
-# endif
-# define machine_is_active()	(machine_arch_type == MACH_TYPE_ACTIVE)
-#else
-# define machine_is_active()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IQ80321
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IQ80321
-# endif
-# define machine_is_iq80321()	(machine_arch_type == MACH_TYPE_IQ80321)
-#else
-# define machine_is_iq80321()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_WID
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WID
-# endif
-# define machine_is_wid()	(machine_arch_type == MACH_TYPE_WID)
-#else
-# define machine_is_wid()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_SABINAL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SABINAL
-# endif
-# define machine_is_sabinal()	(machine_arch_type == MACH_TYPE_SABINAL)
-#else
-# define machine_is_sabinal()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IXP425_MATACUMBE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXP425_MATACUMBE
-# endif
-# define machine_is_ixp425_matacumbe()	(machine_arch_type == MACH_TYPE_IXP425_MATACUMBE)
-#else
-# define machine_is_ixp425_matacumbe()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_MINIPRINT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MINIPRINT
-# endif
-# define machine_is_miniprint()	(machine_arch_type == MACH_TYPE_MINIPRINT)
-#else
-# define machine_is_miniprint()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ADM510X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADM510X
-# endif
-# define machine_is_adm510x()	(machine_arch_type == MACH_TYPE_ADM510X)
-#else
-# define machine_is_adm510x()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_SVS200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SVS200
-# endif
-# define machine_is_svs200()	(machine_arch_type == MACH_TYPE_SVS200)
-#else
-# define machine_is_svs200()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ATG_TCU
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ATG_TCU
-# endif
-# define machine_is_atg_tcu()	(machine_arch_type == MACH_TYPE_ATG_TCU)
-#else
-# define machine_is_atg_tcu()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_JORNADA820
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_JORNADA820
-# endif
-# define machine_is_jornada820()	(machine_arch_type == MACH_TYPE_JORNADA820)
-#else
-# define machine_is_jornada820()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_S3C44B0
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S3C44B0
-# endif
-# define machine_is_s3c44b0()	(machine_arch_type == MACH_TYPE_S3C44B0)
-#else
-# define machine_is_s3c44b0()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_MARGIS2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MARGIS2
-# endif
-# define machine_is_margis2()	(machine_arch_type == MACH_TYPE_MARGIS2)
-#else
-# define machine_is_margis2()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_KS8695
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KS8695
-# endif
-# define machine_is_ks8695()	(machine_arch_type == MACH_TYPE_KS8695)
-#else
-# define machine_is_ks8695()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_BRH
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BRH
-# endif
-# define machine_is_brh()	(machine_arch_type == MACH_TYPE_BRH)
-#else
-# define machine_is_brh()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_S3C2410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S3C2410
-# endif
-# define machine_is_s3c2410()	(machine_arch_type == MACH_TYPE_S3C2410)
-#else
-# define machine_is_s3c2410()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_POSSIO_PX30
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_POSSIO_PX30
-# endif
-# define machine_is_possio_px30()	(machine_arch_type == MACH_TYPE_POSSIO_PX30)
-#else
-# define machine_is_possio_px30()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_S3C2800
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S3C2800
-# endif
-# define machine_is_s3c2800()	(machine_arch_type == MACH_TYPE_S3C2800)
-#else
-# define machine_is_s3c2800()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_FLEETWOOD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FLEETWOOD
-# endif
-# define machine_is_fleetwood()	(machine_arch_type == MACH_TYPE_FLEETWOOD)
-#else
-# define machine_is_fleetwood()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_OMAHA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAHA
-# endif
-# define machine_is_omaha()	(machine_arch_type == MACH_TYPE_OMAHA)
-#else
-# define machine_is_omaha()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_TA7
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TA7
-# endif
-# define machine_is_ta7()	(machine_arch_type == MACH_TYPE_TA7)
-#else
-# define machine_is_ta7()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_NOVA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NOVA
-# endif
-# define machine_is_nova()	(machine_arch_type == MACH_TYPE_NOVA)
-#else
-# define machine_is_nova()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_HMK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HMK
-# endif
-# define machine_is_hmk()	(machine_arch_type == MACH_TYPE_HMK)
-#else
-# define machine_is_hmk()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_KARO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KARO
-# endif
-# define machine_is_karo()	(machine_arch_type == MACH_TYPE_KARO)
-#else
-# define machine_is_karo()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_FESTER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FESTER
-# endif
-# define machine_is_fester()	(machine_arch_type == MACH_TYPE_FESTER)
-#else
-# define machine_is_fester()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_GPI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GPI
-# endif
-# define machine_is_gpi()	(machine_arch_type == MACH_TYPE_GPI)
-#else
-# define machine_is_gpi()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_SMDK2410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMDK2410
-# endif
-# define machine_is_smdk2410()	(machine_arch_type == MACH_TYPE_SMDK2410)
-#else
-# define machine_is_smdk2410()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_I519
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_I519
-# endif
-# define machine_is_i519()	(machine_arch_type == MACH_TYPE_I519)
-#else
-# define machine_is_i519()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_NEXIO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NEXIO
-# endif
-# define machine_is_nexio()	(machine_arch_type == MACH_TYPE_NEXIO)
-#else
-# define machine_is_nexio()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_BITBOX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BITBOX
-# endif
-# define machine_is_bitbox()	(machine_arch_type == MACH_TYPE_BITBOX)
-#else
-# define machine_is_bitbox()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_G200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_G200
-# endif
-# define machine_is_g200()	(machine_arch_type == MACH_TYPE_G200)
-#else
-# define machine_is_g200()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_GILL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GILL
-# endif
-# define machine_is_gill()	(machine_arch_type == MACH_TYPE_GILL)
-#else
-# define machine_is_gill()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PXA_MERCURY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXA_MERCURY
-# endif
-# define machine_is_pxa_mercury()	(machine_arch_type == MACH_TYPE_PXA_MERCURY)
-#else
-# define machine_is_pxa_mercury()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_CEIVA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CEIVA
-# endif
-# define machine_is_ceiva()	(machine_arch_type == MACH_TYPE_CEIVA)
-#else
-# define machine_is_ceiva()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_FRET
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FRET
-# endif
-# define machine_is_fret()	(machine_arch_type == MACH_TYPE_FRET)
-#else
-# define machine_is_fret()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_EMAILPHONE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EMAILPHONE
-# endif
-# define machine_is_emailphone()	(machine_arch_type == MACH_TYPE_EMAILPHONE)
-#else
-# define machine_is_emailphone()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_H3900
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_H3900
-# endif
-# define machine_is_h3900()	(machine_arch_type == MACH_TYPE_H3900)
-#else
-# define machine_is_h3900()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PXA1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXA1
-# endif
-# define machine_is_pxa1()	(machine_arch_type == MACH_TYPE_PXA1)
-#else
-# define machine_is_pxa1()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_KOAN369
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KOAN369
-# endif
-# define machine_is_koan369()	(machine_arch_type == MACH_TYPE_KOAN369)
-#else
-# define machine_is_koan369()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_COGENT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_COGENT
-# endif
-# define machine_is_cogent()	(machine_arch_type == MACH_TYPE_COGENT)
-#else
-# define machine_is_cogent()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ESL_SIMPUTER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ESL_SIMPUTER
-# endif
-# define machine_is_esl_simputer()	(machine_arch_type == MACH_TYPE_ESL_SIMPUTER)
-#else
-# define machine_is_esl_simputer()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ESL_SIMPUTER_CLR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ESL_SIMPUTER_CLR
-# endif
-# define machine_is_esl_simputer_clr()	(machine_arch_type == MACH_TYPE_ESL_SIMPUTER_CLR)
-#else
-# define machine_is_esl_simputer_clr()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ESL_SIMPUTER_BW
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ESL_SIMPUTER_BW
-# endif
-# define machine_is_esl_simputer_bw()	(machine_arch_type == MACH_TYPE_ESL_SIMPUTER_BW)
-#else
-# define machine_is_esl_simputer_bw()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_HHP_CRADLE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HHP_CRADLE
-# endif
-# define machine_is_hhp_cradle()	(machine_arch_type == MACH_TYPE_HHP_CRADLE)
-#else
-# define machine_is_hhp_cradle()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_HE500
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HE500
-# endif
-# define machine_is_he500()	(machine_arch_type == MACH_TYPE_HE500)
-#else
-# define machine_is_he500()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_INHANDELF2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_INHANDELF2
-# endif
-# define machine_is_inhandelf2()	(machine_arch_type == MACH_TYPE_INHANDELF2)
-#else
-# define machine_is_inhandelf2()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_INHANDFTIP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_INHANDFTIP
-# endif
-# define machine_is_inhandftip()	(machine_arch_type == MACH_TYPE_INHANDFTIP)
-#else
-# define machine_is_inhandftip()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_DNP1110
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DNP1110
-# endif
-# define machine_is_dnp1110()	(machine_arch_type == MACH_TYPE_DNP1110)
-#else
-# define machine_is_dnp1110()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_PNP1110
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PNP1110
-# endif
-# define machine_is_pnp1110()	(machine_arch_type == MACH_TYPE_PNP1110)
-#else
-# define machine_is_pnp1110()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_CSB226
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CSB226
-# endif
-# define machine_is_csb226()	(machine_arch_type == MACH_TYPE_CSB226)
-#else
-# define machine_is_csb226()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_ARNOLD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARNOLD
-# endif
-# define machine_is_arnold()	(machine_arch_type == MACH_TYPE_ARNOLD)
-#else
-# define machine_is_arnold()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VOICEBLUE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VOICEBLUE
-# endif
-# define machine_is_voiceblue()	(machine_arch_type == MACH_TYPE_VOICEBLUE)
-#else
-# define machine_is_voiceblue()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_JZ8028
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_JZ8028
-# endif
-# define machine_is_jz8028()	(machine_arch_type == MACH_TYPE_JZ8028)
-#else
-# define machine_is_jz8028()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_H5400
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_H5400
-# endif
-# define machine_is_h5400()	(machine_arch_type == MACH_TYPE_H5400)
-#else
-# define machine_is_h5400()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_FORTE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FORTE
-# endif
-# define machine_is_forte()	(machine_arch_type == MACH_TYPE_FORTE)
-#else
-# define machine_is_forte()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_ACAM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ACAM
-# endif
-# define machine_is_acam()	(machine_arch_type == MACH_TYPE_ACAM)
-#else
-# define machine_is_acam()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_ABOX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ABOX
-# endif
-# define machine_is_abox()	(machine_arch_type == MACH_TYPE_ABOX)
-#else
-# define machine_is_abox()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ATMEL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ATMEL
-# endif
-# define machine_is_atmel()	(machine_arch_type == MACH_TYPE_ATMEL)
-#else
-# define machine_is_atmel()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_SITSANG
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SITSANG
-# endif
-# define machine_is_sitsang()	(machine_arch_type == MACH_TYPE_SITSANG)
-#else
-# define machine_is_sitsang()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_CPU1110LCDNET
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CPU1110LCDNET
-# endif
-# define machine_is_cpu1110lcdnet()	(machine_arch_type == MACH_TYPE_CPU1110LCDNET)
-#else
-# define machine_is_cpu1110lcdnet()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_MPL_VCMA9
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MPL_VCMA9
-# endif
-# define machine_is_mpl_vcma9()	(machine_arch_type == MACH_TYPE_MPL_VCMA9)
-#else
-# define machine_is_mpl_vcma9()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_OPUS_A1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OPUS_A1
-# endif
-# define machine_is_opus_a1()	(machine_arch_type == MACH_TYPE_OPUS_A1)
-#else
-# define machine_is_opus_a1()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_DAYTONA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DAYTONA
-# endif
-# define machine_is_daytona()	(machine_arch_type == MACH_TYPE_DAYTONA)
-#else
-# define machine_is_daytona()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_KILLBEAR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KILLBEAR
-# endif
-# define machine_is_killbear()	(machine_arch_type == MACH_TYPE_KILLBEAR)
-#else
-# define machine_is_killbear()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_YOHO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_YOHO
-# endif
-# define machine_is_yoho()	(machine_arch_type == MACH_TYPE_YOHO)
-#else
-# define machine_is_yoho()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_JASPER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_JASPER
-# endif
-# define machine_is_jasper()	(machine_arch_type == MACH_TYPE_JASPER)
-#else
-# define machine_is_jasper()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_DSC25
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DSC25
-# endif
-# define machine_is_dsc25()	(machine_arch_type == MACH_TYPE_DSC25)
-#else
-# define machine_is_dsc25()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_INNOVATOR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_INNOVATOR
-# endif
-# define machine_is_omap_innovator()	(machine_arch_type == MACH_TYPE_OMAP_INNOVATOR)
-#else
-# define machine_is_omap_innovator()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_RAMSES
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RAMSES
-# endif
-# define machine_is_mnci()	(machine_arch_type == MACH_TYPE_RAMSES)
-#else
-# define machine_is_mnci()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_S28X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S28X
-# endif
-# define machine_is_s28x()	(machine_arch_type == MACH_TYPE_S28X)
-#else
-# define machine_is_s28x()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_MPORT3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MPORT3
-# endif
-# define machine_is_mport3()	(machine_arch_type == MACH_TYPE_MPORT3)
-#else
-# define machine_is_mport3()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PXA_EAGLE250
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXA_EAGLE250
-# endif
-# define machine_is_pxa_eagle250()	(machine_arch_type == MACH_TYPE_PXA_EAGLE250)
-#else
-# define machine_is_pxa_eagle250()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PDB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PDB
-# endif
-# define machine_is_pdb()	(machine_arch_type == MACH_TYPE_PDB)
-#else
-# define machine_is_pdb()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_BLUE_2G
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BLUE_2G
-# endif
-# define machine_is_blue_2g()	(machine_arch_type == MACH_TYPE_BLUE_2G)
-#else
-# define machine_is_blue_2g()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_BLUEARCH
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BLUEARCH
-# endif
-# define machine_is_bluearch()	(machine_arch_type == MACH_TYPE_BLUEARCH)
-#else
-# define machine_is_bluearch()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IXDP2400
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXDP2400
-# endif
-# define machine_is_ixdp2400()	(machine_arch_type == MACH_TYPE_IXDP2400)
-#else
-# define machine_is_ixdp2400()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IXDP2800
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXDP2800
-# endif
-# define machine_is_ixdp2800()	(machine_arch_type == MACH_TYPE_IXDP2800)
-#else
-# define machine_is_ixdp2800()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_EXPLORER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EXPLORER
-# endif
-# define machine_is_explorer()	(machine_arch_type == MACH_TYPE_EXPLORER)
-#else
-# define machine_is_explorer()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IXDP425
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXDP425
-# endif
-# define machine_is_ixdp425()	(machine_arch_type == MACH_TYPE_IXDP425)
-#else
-# define machine_is_ixdp425()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_CHIMP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CHIMP
-# endif
-# define machine_is_chimp()	(machine_arch_type == MACH_TYPE_CHIMP)
-#else
-# define machine_is_chimp()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_STORK_NEST
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STORK_NEST
-# endif
-# define machine_is_stork_nest()	(machine_arch_type == MACH_TYPE_STORK_NEST)
-#else
-# define machine_is_stork_nest()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_STORK_EGG
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STORK_EGG
-# endif
-# define machine_is_stork_egg()	(machine_arch_type == MACH_TYPE_STORK_EGG)
-#else
-# define machine_is_stork_egg()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_WISMO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WISMO
-# endif
-# define machine_is_wismo()	(machine_arch_type == MACH_TYPE_WISMO)
-#else
-# define machine_is_wismo()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_EZLINX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EZLINX
-# endif
-# define machine_is_ezlinx()	(machine_arch_type == MACH_TYPE_EZLINX)
-#else
-# define machine_is_ezlinx()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_AT91RM9200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91RM9200
-# endif
-# define machine_is_at91rm9200()	(machine_arch_type == MACH_TYPE_AT91RM9200)
-#else
-# define machine_is_at91rm9200()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ADTECH_ORION
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADTECH_ORION
-# endif
-# define machine_is_adtech_orion()	(machine_arch_type == MACH_TYPE_ADTECH_ORION)
-#else
-# define machine_is_adtech_orion()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_NEPTUNE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NEPTUNE
-# endif
-# define machine_is_neptune()	(machine_arch_type == MACH_TYPE_NEPTUNE)
-#else
-# define machine_is_neptune()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_HACKKIT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HACKKIT
-# endif
-# define machine_is_hackkit()	(machine_arch_type == MACH_TYPE_HACKKIT)
-#else
-# define machine_is_hackkit()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PXA_WINS30
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXA_WINS30
-# endif
-# define machine_is_pxa_wins30()	(machine_arch_type == MACH_TYPE_PXA_WINS30)
-#else
-# define machine_is_pxa_wins30()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_LAVINNA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LAVINNA
-# endif
-# define machine_is_lavinna()	(machine_arch_type == MACH_TYPE_LAVINNA)
-#else
-# define machine_is_lavinna()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PXA_UENGINE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXA_UENGINE
-# endif
-# define machine_is_pxa_uengine()	(machine_arch_type == MACH_TYPE_PXA_UENGINE)
-#else
-# define machine_is_pxa_uengine()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_INNOKOM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_INNOKOM
-# endif
-# define machine_is_innokom()	(machine_arch_type == MACH_TYPE_INNOKOM)
-#else
-# define machine_is_innokom()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_BMS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BMS
-# endif
-# define machine_is_bms()	(machine_arch_type == MACH_TYPE_BMS)
-#else
-# define machine_is_bms()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IXCDP1100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXCDP1100
-# endif
-# define machine_is_ixcdp1100()	(machine_arch_type == MACH_TYPE_IXCDP1100)
-#else
-# define machine_is_ixcdp1100()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PRPMC1100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PRPMC1100
-# endif
-# define machine_is_prpmc1100()	(machine_arch_type == MACH_TYPE_PRPMC1100)
-#else
-# define machine_is_prpmc1100()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_AT91RM9200DK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91RM9200DK
-# endif
-# define machine_is_at91rm9200dk()	(machine_arch_type == MACH_TYPE_AT91RM9200DK)
-#else
-# define machine_is_at91rm9200dk()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ARMSTICK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARMSTICK
-# endif
-# define machine_is_armstick()	(machine_arch_type == MACH_TYPE_ARMSTICK)
-#else
-# define machine_is_armstick()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ARMONIE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARMONIE
-# endif
-# define machine_is_armonie()	(machine_arch_type == MACH_TYPE_ARMONIE)
-#else
-# define machine_is_armonie()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_MPORT1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MPORT1
-# endif
-# define machine_is_mport1()	(machine_arch_type == MACH_TYPE_MPORT1)
-#else
-# define machine_is_mport1()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_S3C5410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S3C5410
-# endif
-# define machine_is_s3c5410()	(machine_arch_type == MACH_TYPE_S3C5410)
-#else
-# define machine_is_s3c5410()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ZCP320A
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZCP320A
-# endif
-# define machine_is_zcp320a()	(machine_arch_type == MACH_TYPE_ZCP320A)
-#else
-# define machine_is_zcp320a()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_I_BOX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_I_BOX
-# endif
-# define machine_is_i_box()	(machine_arch_type == MACH_TYPE_I_BOX)
-#else
-# define machine_is_i_box()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_STLC1502
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STLC1502
-# endif
-# define machine_is_stlc1502()	(machine_arch_type == MACH_TYPE_STLC1502)
-#else
-# define machine_is_stlc1502()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_SIREN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SIREN
-# endif
-# define machine_is_siren()	(machine_arch_type == MACH_TYPE_SIREN)
-#else
-# define machine_is_siren()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_GREENLAKE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GREENLAKE
-# endif
-# define machine_is_greenlake()	(machine_arch_type == MACH_TYPE_GREENLAKE)
-#else
-# define machine_is_greenlake()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ARGUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARGUS
-# endif
-# define machine_is_argus()	(machine_arch_type == MACH_TYPE_ARGUS)
-#else
-# define machine_is_argus()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_COMBADGE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_COMBADGE
-# endif
-# define machine_is_combadge()	(machine_arch_type == MACH_TYPE_COMBADGE)
-#else
-# define machine_is_combadge()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ROKEPXA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ROKEPXA
-# endif
-# define machine_is_rokepxa()	(machine_arch_type == MACH_TYPE_ROKEPXA)
-#else
-# define machine_is_rokepxa()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_CINTEGRATOR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CINTEGRATOR
-# endif
-# define machine_is_cintegrator()	(machine_arch_type == MACH_TYPE_CINTEGRATOR)
-#else
-# define machine_is_cintegrator()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_GUIDEA07
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GUIDEA07
-# endif
-# define machine_is_guidea07()	(machine_arch_type == MACH_TYPE_GUIDEA07)
-#else
-# define machine_is_guidea07()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_TAT257
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TAT257
-# endif
-# define machine_is_tat257()	(machine_arch_type == MACH_TYPE_TAT257)
-#else
-# define machine_is_tat257()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IGP2425
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IGP2425
-# endif
-# define machine_is_igp2425()	(machine_arch_type == MACH_TYPE_IGP2425)
-#else
-# define machine_is_igp2425()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_BLUEGRAMMA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BLUEGRAMMA
-# endif
-# define machine_is_bluegrama()	(machine_arch_type == MACH_TYPE_BLUEGRAMMA)
-#else
-# define machine_is_bluegrama()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IPOD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IPOD
-# endif
-# define machine_is_ipod()	(machine_arch_type == MACH_TYPE_IPOD)
-#else
-# define machine_is_ipod()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ADSBITSYX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADSBITSYX
-# endif
-# define machine_is_adsbitsyx()	(machine_arch_type == MACH_TYPE_ADSBITSYX)
-#else
-# define machine_is_adsbitsyx()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_TRIZEPS2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TRIZEPS2
-# endif
-# define machine_is_trizeps2()	(machine_arch_type == MACH_TYPE_TRIZEPS2)
-#else
-# define machine_is_trizeps2()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_VIPER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VIPER
-# endif
-# define machine_is_viper()	(machine_arch_type == MACH_TYPE_VIPER)
-#else
-# define machine_is_viper()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_ADSBITSYPLUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADSBITSYPLUS
-# endif
-# define machine_is_adsbitsyplus()	(machine_arch_type == MACH_TYPE_ADSBITSYPLUS)
-#else
-# define machine_is_adsbitsyplus()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_ADSAGC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADSAGC
-# endif
-# define machine_is_adsagc()	(machine_arch_type == MACH_TYPE_ADSAGC)
-#else
-# define machine_is_adsagc()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_STP7312
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STP7312
-# endif
-# define machine_is_stp7312()	(machine_arch_type == MACH_TYPE_STP7312)
-#else
-# define machine_is_stp7312()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NX_PHNX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NX_PHNX
-# endif
-# define machine_is_nx_phnx()	(machine_arch_type == MACH_TYPE_NX_PHNX)
-#else
-# define machine_is_nx_phnx()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_WEP_EP250
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WEP_EP250
-# endif
-# define machine_is_wep_ep250()	(machine_arch_type == MACH_TYPE_WEP_EP250)
-#else
-# define machine_is_wep_ep250()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_INHANDELF3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_INHANDELF3
-# endif
-# define machine_is_inhandelf3()	(machine_arch_type == MACH_TYPE_INHANDELF3)
-#else
-# define machine_is_inhandelf3()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ADI_COYOTE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADI_COYOTE
-# endif
-# define machine_is_adi_coyote()	(machine_arch_type == MACH_TYPE_ADI_COYOTE)
-#else
-# define machine_is_adi_coyote()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IYONIX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IYONIX
-# endif
-# define machine_is_iyonix()	(machine_arch_type == MACH_TYPE_IYONIX)
-#else
-# define machine_is_iyonix()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_DAMICAM_SA1110
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DAMICAM_SA1110
-# endif
-# define machine_is_damicam1()	(machine_arch_type == MACH_TYPE_DAMICAM_SA1110)
-#else
-# define machine_is_damicam1()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_MEG03
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MEG03
-# endif
-# define machine_is_meg03()	(machine_arch_type == MACH_TYPE_MEG03)
-#else
-# define machine_is_meg03()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PXA_WHITECHAPEL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXA_WHITECHAPEL
-# endif
-# define machine_is_pxa_whitechapel()	(machine_arch_type == MACH_TYPE_PXA_WHITECHAPEL)
-#else
-# define machine_is_pxa_whitechapel()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_NWSC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NWSC
-# endif
-# define machine_is_nwsc()	(machine_arch_type == MACH_TYPE_NWSC)
-#else
-# define machine_is_nwsc()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_NWLARM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NWLARM
-# endif
-# define machine_is_nwlarm()	(machine_arch_type == MACH_TYPE_NWLARM)
-#else
-# define machine_is_nwlarm()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IXP425_MGUARD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXP425_MGUARD
-# endif
-# define machine_is_ixp425_mguard()	(machine_arch_type == MACH_TYPE_IXP425_MGUARD)
-#else
-# define machine_is_ixp425_mguard()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PXA_NETDCU4
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXA_NETDCU4
-# endif
-# define machine_is_pxa_netdcu4()	(machine_arch_type == MACH_TYPE_PXA_NETDCU4)
-#else
-# define machine_is_pxa_netdcu4()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IXDP2401
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXDP2401
-# endif
-# define machine_is_ixdp2401()	(machine_arch_type == MACH_TYPE_IXDP2401)
-#else
-# define machine_is_ixdp2401()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IXDP2801
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXDP2801
-# endif
-# define machine_is_ixdp2801()	(machine_arch_type == MACH_TYPE_IXDP2801)
-#else
-# define machine_is_ixdp2801()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ZODIAC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZODIAC
-# endif
-# define machine_is_zodiac()	(machine_arch_type == MACH_TYPE_ZODIAC)
-#else
-# define machine_is_zodiac()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ARMMODUL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARMMODUL
-# endif
-# define machine_is_armmodul()	(machine_arch_type == MACH_TYPE_ARMMODUL)
-#else
-# define machine_is_armmodul()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_KETOP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KETOP
-# endif
-# define machine_is_ketop()	(machine_arch_type == MACH_TYPE_KETOP)
-#else
-# define machine_is_ketop()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_AV7200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AV7200
-# endif
-# define machine_is_av7200()	(machine_arch_type == MACH_TYPE_AV7200)
-#else
-# define machine_is_av7200()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ARCH_TI925
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARCH_TI925
-# endif
-# define machine_is_arch_ti925()	(machine_arch_type == MACH_TYPE_ARCH_TI925)
-#else
-# define machine_is_arch_ti925()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ACQ200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ACQ200
-# endif
-# define machine_is_acq200()	(machine_arch_type == MACH_TYPE_ACQ200)
-#else
-# define machine_is_acq200()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_PT_DAFIT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PT_DAFIT
-# endif
-# define machine_is_pt_dafit()	(machine_arch_type == MACH_TYPE_PT_DAFIT)
-#else
-# define machine_is_pt_dafit()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IHBA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IHBA
-# endif
-# define machine_is_ihba()	(machine_arch_type == MACH_TYPE_IHBA)
-#else
-# define machine_is_ihba()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_QUINQUE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_QUINQUE
-# endif
-# define machine_is_quinque()	(machine_arch_type == MACH_TYPE_QUINQUE)
-#else
-# define machine_is_quinque()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_NIMBRAONE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NIMBRAONE
-# endif
-# define machine_is_nimbraone()	(machine_arch_type == MACH_TYPE_NIMBRAONE)
-#else
-# define machine_is_nimbraone()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_NIMBRA29X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NIMBRA29X
-# endif
-# define machine_is_nimbra29x()	(machine_arch_type == MACH_TYPE_NIMBRA29X)
-#else
-# define machine_is_nimbra29x()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_NIMBRA210
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NIMBRA210
-# endif
-# define machine_is_nimbra210()	(machine_arch_type == MACH_TYPE_NIMBRA210)
-#else
-# define machine_is_nimbra210()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_HHP_D95XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HHP_D95XX
-# endif
-# define machine_is_hhp_d95xx()	(machine_arch_type == MACH_TYPE_HHP_D95XX)
-#else
-# define machine_is_hhp_d95xx()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_LABARM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LABARM
-# endif
-# define machine_is_labarm()	(machine_arch_type == MACH_TYPE_LABARM)
-#else
-# define machine_is_labarm()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_M825XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_M825XX
-# endif
-# define machine_is_m825xx()	(machine_arch_type == MACH_TYPE_M825XX)
-#else
-# define machine_is_m825xx()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_M7100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_M7100
-# endif
-# define machine_is_m7100()	(machine_arch_type == MACH_TYPE_M7100)
-#else
-# define machine_is_m7100()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_NIPC2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NIPC2
-# endif
-# define machine_is_nipc2()	(machine_arch_type == MACH_TYPE_NIPC2)
-#else
-# define machine_is_nipc2()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_FU7202
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FU7202
-# endif
-# define machine_is_fu7202()	(machine_arch_type == MACH_TYPE_FU7202)
-#else
-# define machine_is_fu7202()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ADSAGX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADSAGX
-# endif
-# define machine_is_adsagx()	(machine_arch_type == MACH_TYPE_ADSAGX)
-#else
-# define machine_is_adsagx()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PXA_POOH
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXA_POOH
-# endif
-# define machine_is_pxa_pooh()	(machine_arch_type == MACH_TYPE_PXA_POOH)
-#else
-# define machine_is_pxa_pooh()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_BANDON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BANDON
-# endif
-# define machine_is_bandon()	(machine_arch_type == MACH_TYPE_BANDON)
-#else
-# define machine_is_bandon()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PCM7210
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PCM7210
-# endif
-# define machine_is_pcm7210()	(machine_arch_type == MACH_TYPE_PCM7210)
-#else
-# define machine_is_pcm7210()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_NMS9200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NMS9200
-# endif
-# define machine_is_nms9200()	(machine_arch_type == MACH_TYPE_NMS9200)
-#else
-# define machine_is_nms9200()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_LOGODL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LOGODL
-# endif
-# define machine_is_logodl()	(machine_arch_type == MACH_TYPE_LOGODL)
-#else
-# define machine_is_logodl()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_M7140
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_M7140
-# endif
-# define machine_is_m7140()	(machine_arch_type == MACH_TYPE_M7140)
-#else
-# define machine_is_m7140()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_KOREBOT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KOREBOT
-# endif
-# define machine_is_korebot()	(machine_arch_type == MACH_TYPE_KOREBOT)
-#else
-# define machine_is_korebot()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IQ31244
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IQ31244
-# endif
-# define machine_is_iq31244()	(machine_arch_type == MACH_TYPE_IQ31244)
-#else
-# define machine_is_iq31244()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_KOAN393
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KOAN393
-# endif
-# define machine_is_koan393()	(machine_arch_type == MACH_TYPE_KOAN393)
-#else
-# define machine_is_koan393()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_INHANDFTIP3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_INHANDFTIP3
-# endif
-# define machine_is_inhandftip3()	(machine_arch_type == MACH_TYPE_INHANDFTIP3)
-#else
-# define machine_is_inhandftip3()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_GONZO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GONZO
-# endif
-# define machine_is_gonzo()	(machine_arch_type == MACH_TYPE_GONZO)
-#else
-# define machine_is_gonzo()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_BAST
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BAST
-# endif
-# define machine_is_bast()	(machine_arch_type == MACH_TYPE_BAST)
-#else
-# define machine_is_bast()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_SCANPASS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SCANPASS
-# endif
-# define machine_is_scanpass()	(machine_arch_type == MACH_TYPE_SCANPASS)
-#else
-# define machine_is_scanpass()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_EP7312_POOH
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EP7312_POOH
-# endif
-# define machine_is_ep7312_pooh()	(machine_arch_type == MACH_TYPE_EP7312_POOH)
-#else
-# define machine_is_ep7312_pooh()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_TA7S
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TA7S
-# endif
-# define machine_is_ta7s()	(machine_arch_type == MACH_TYPE_TA7S)
-#else
-# define machine_is_ta7s()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_TA7V
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TA7V
-# endif
-# define machine_is_ta7v()	(machine_arch_type == MACH_TYPE_TA7V)
-#else
-# define machine_is_ta7v()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_ICARUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ICARUS
-# endif
-# define machine_is_icarus()	(machine_arch_type == MACH_TYPE_ICARUS)
-#else
-# define machine_is_icarus()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_H1900
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_H1900
-# endif
-# define machine_is_h1900()	(machine_arch_type == MACH_TYPE_H1900)
-#else
-# define machine_is_h1900()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_GEMINI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GEMINI
-# endif
-# define machine_is_gemini()	(machine_arch_type == MACH_TYPE_GEMINI)
-#else
-# define machine_is_gemini()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_AXIM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AXIM
-# endif
-# define machine_is_axim()	(machine_arch_type == MACH_TYPE_AXIM)
-#else
-# define machine_is_axim()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_AUDIOTRON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AUDIOTRON
-# endif
-# define machine_is_audiotron()	(machine_arch_type == MACH_TYPE_AUDIOTRON)
-#else
-# define machine_is_audiotron()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_H2200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_H2200
-# endif
-# define machine_is_h2200()	(machine_arch_type == MACH_TYPE_H2200)
-#else
-# define machine_is_h2200()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_LOOX600
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LOOX600
-# endif
-# define machine_is_loox600()	(machine_arch_type == MACH_TYPE_LOOX600)
-#else
-# define machine_is_loox600()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_NIOP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NIOP
-# endif
-# define machine_is_niop()	(machine_arch_type == MACH_TYPE_NIOP)
-#else
-# define machine_is_niop()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_DM310
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DM310
-# endif
-# define machine_is_dm310()	(machine_arch_type == MACH_TYPE_DM310)
-#else
-# define machine_is_dm310()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_SEEDPXA_C2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SEEDPXA_C2
-# endif
-# define machine_is_seedpxa_c2()	(machine_arch_type == MACH_TYPE_SEEDPXA_C2)
-#else
-# define machine_is_seedpxa_c2()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IXP4XX_MGUARD_PCI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXP4XX_MGUARD_PCI
-# endif
-# define machine_is_ixp4xx_mguardpci()	(machine_arch_type == MACH_TYPE_IXP4XX_MGUARD_PCI)
-#else
-# define machine_is_ixp4xx_mguardpci()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_H1940
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_H1940
-# endif
-# define machine_is_h1940()	(machine_arch_type == MACH_TYPE_H1940)
-#else
-# define machine_is_h1940()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_SCORPIO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SCORPIO
-# endif
-# define machine_is_scorpio()	(machine_arch_type == MACH_TYPE_SCORPIO)
-#else
-# define machine_is_scorpio()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_VIVA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VIVA
-# endif
-# define machine_is_viva()	(machine_arch_type == MACH_TYPE_VIVA)
-#else
-# define machine_is_viva()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PXA_XCARD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXA_XCARD
-# endif
-# define machine_is_pxa_xcard()	(machine_arch_type == MACH_TYPE_PXA_XCARD)
-#else
-# define machine_is_pxa_xcard()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_CSB335
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CSB335
-# endif
-# define machine_is_csb335()	(machine_arch_type == MACH_TYPE_CSB335)
-#else
-# define machine_is_csb335()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IXRD425
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXRD425
-# endif
-# define machine_is_ixrd425()	(machine_arch_type == MACH_TYPE_IXRD425)
-#else
-# define machine_is_ixrd425()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IQ80315
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IQ80315
-# endif
-# define machine_is_iq80315()	(machine_arch_type == MACH_TYPE_IQ80315)
-#else
-# define machine_is_iq80315()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_NMP7312
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NMP7312
-# endif
-# define machine_is_nmp7312()	(machine_arch_type == MACH_TYPE_NMP7312)
-#else
-# define machine_is_nmp7312()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_CX861XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CX861XX
-# endif
-# define machine_is_cx861xx()	(machine_arch_type == MACH_TYPE_CX861XX)
-#else
-# define machine_is_cx861xx()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ENP2611
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ENP2611
-# endif
-# define machine_is_enp2611()	(machine_arch_type == MACH_TYPE_ENP2611)
-#else
-# define machine_is_enp2611()	(0)
-#endif
-
-#ifdef CONFIG_SA1100_XDA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XDA
-# endif
-# define machine_is_xda()	(machine_arch_type == MACH_TYPE_XDA)
-#else
-# define machine_is_xda()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_CSIR_IMS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CSIR_IMS
-# endif
-# define machine_is_csir_ims()	(machine_arch_type == MACH_TYPE_CSIR_IMS)
-#else
-# define machine_is_csir_ims()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IXP421_DNAEETH
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXP421_DNAEETH
-# endif
-# define machine_is_ixp421_dnaeeth()	(machine_arch_type == MACH_TYPE_IXP421_DNAEETH)
-#else
-# define machine_is_ixp421_dnaeeth()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_POCKETSERV9200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_POCKETSERV9200
-# endif
-# define machine_is_pocketserv9200()	(machine_arch_type == MACH_TYPE_POCKETSERV9200)
-#else
-# define machine_is_pocketserv9200()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_TOTO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TOTO
-# endif
-# define machine_is_toto()	(machine_arch_type == MACH_TYPE_TOTO)
-#else
-# define machine_is_toto()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_S3C2440
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S3C2440
-# endif
-# define machine_is_s3c2440()	(machine_arch_type == MACH_TYPE_S3C2440)
-#else
-# define machine_is_s3c2440()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_KS8695P
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KS8695P
-# endif
-# define machine_is_ks8695p()	(machine_arch_type == MACH_TYPE_KS8695P)
-#else
-# define machine_is_ks8695p()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_SE4000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SE4000
-# endif
-# define machine_is_se4000()	(machine_arch_type == MACH_TYPE_SE4000)
-#else
-# define machine_is_se4000()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_QUADRICEPS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_QUADRICEPS
-# endif
-# define machine_is_quadriceps()	(machine_arch_type == MACH_TYPE_QUADRICEPS)
-#else
-# define machine_is_quadriceps()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_BRONCO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BRONCO
-# endif
-# define machine_is_bronco()	(machine_arch_type == MACH_TYPE_BRONCO)
-#else
-# define machine_is_bronco()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ESL_WIRELESS_TAB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ESL_WIRELESS_TAB
-# endif
-# define machine_is_esl_wireless_tab()	(machine_arch_type == MACH_TYPE_ESL_WIRELESS_TAB)
-#else
-# define machine_is_esl_wireless_tab()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ESL_SOFCOMP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ESL_SOFCOMP
-# endif
-# define machine_is_esl_sofcomp()	(machine_arch_type == MACH_TYPE_ESL_SOFCOMP)
-#else
-# define machine_is_esl_sofcomp()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_S5C7375
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S5C7375
-# endif
-# define machine_is_s5c7375()	(machine_arch_type == MACH_TYPE_S5C7375)
-#else
-# define machine_is_s5c7375()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_SPEARHEAD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SPEARHEAD
-# endif
-# define machine_is_spearhead()	(machine_arch_type == MACH_TYPE_SPEARHEAD)
-#else
-# define machine_is_spearhead()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PANTERA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PANTERA
-# endif
-# define machine_is_pantera()	(machine_arch_type == MACH_TYPE_PANTERA)
-#else
-# define machine_is_pantera()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PRAYOGLITE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PRAYOGLITE
-# endif
-# define machine_is_prayoglite()	(machine_arch_type == MACH_TYPE_PRAYOGLITE)
-#else
-# define machine_is_prayoglite()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_GUMSTIX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GUMSTIX
-# endif
-# define machine_is_gumstix()	(machine_arch_type == MACH_TYPE_GUMSTIX)
-#else
-# define machine_is_gumstix()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_RCUBE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RCUBE
-# endif
-# define machine_is_rcube()	(machine_arch_type == MACH_TYPE_RCUBE)
-#else
-# define machine_is_rcube()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_REA_OLV
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_REA_OLV
-# endif
-# define machine_is_rea_olv()	(machine_arch_type == MACH_TYPE_REA_OLV)
-#else
-# define machine_is_rea_olv()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PXA_IPHONE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXA_IPHONE
-# endif
-# define machine_is_pxa_iphone()	(machine_arch_type == MACH_TYPE_PXA_IPHONE)
-#else
-# define machine_is_pxa_iphone()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_S3C3410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S3C3410
-# endif
-# define machine_is_s3c3410()	(machine_arch_type == MACH_TYPE_S3C3410)
-#else
-# define machine_is_s3c3410()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ESPD_4510B
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ESPD_4510B
-# endif
-# define machine_is_espd_4510b()	(machine_arch_type == MACH_TYPE_ESPD_4510B)
-#else
-# define machine_is_espd_4510b()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_MP1X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MP1X
-# endif
-# define machine_is_mp1x()	(machine_arch_type == MACH_TYPE_MP1X)
-#else
-# define machine_is_mp1x()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_AT91RM9200TB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91RM9200TB
-# endif
-# define machine_is_at91rm9200tb()	(machine_arch_type == MACH_TYPE_AT91RM9200TB)
-#else
-# define machine_is_at91rm9200tb()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_ADSVGX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADSVGX
-# endif
-# define machine_is_adsvgx()	(machine_arch_type == MACH_TYPE_ADSVGX)
-#else
-# define machine_is_adsvgx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_H2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_H2
-# endif
-# define machine_is_omap_h2()	(machine_arch_type == MACH_TYPE_OMAP_H2)
-#else
-# define machine_is_omap_h2()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_PELEE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PELEE
-# endif
-# define machine_is_pelee()	(machine_arch_type == MACH_TYPE_PELEE)
-#else
-# define machine_is_pelee()	(0)
-#endif
-
-#ifdef CONFIG_MACH_E740
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_E740
-# endif
-# define machine_is_e740()	(machine_arch_type == MACH_TYPE_E740)
-#else
-# define machine_is_e740()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_IQ80331
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IQ80331
-# endif
-# define machine_is_iq80331()	(machine_arch_type == MACH_TYPE_IQ80331)
-#else
-# define machine_is_iq80331()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_VERSATILE_PB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VERSATILE_PB
-# endif
-# define machine_is_versatile_pb()	(machine_arch_type == MACH_TYPE_VERSATILE_PB)
-#else
-# define machine_is_versatile_pb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KEV7A400
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KEV7A400
-# endif
-# define machine_is_kev7a400()	(machine_arch_type == MACH_TYPE_KEV7A400)
-#else
-# define machine_is_kev7a400()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LPD7A400
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LPD7A400
-# endif
-# define machine_is_lpd7a400()	(machine_arch_type == MACH_TYPE_LPD7A400)
-#else
-# define machine_is_lpd7a400()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LPD7A404
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LPD7A404
-# endif
-# define machine_is_lpd7a404()	(machine_arch_type == MACH_TYPE_LPD7A404)
-#else
-# define machine_is_lpd7a404()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_FUJITSU_CAMELOT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FUJITSU_CAMELOT
-# endif
-# define machine_is_fujitsu_camelot()	(machine_arch_type == MACH_TYPE_FUJITSU_CAMELOT)
-#else
-# define machine_is_fujitsu_camelot()	(0)
-#endif
-
-#ifdef CONFIG_ARCH_JANUS2M
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_JANUS2M
-# endif
-# define machine_is_janus2m()	(machine_arch_type == MACH_TYPE_JANUS2M)
-#else
-# define machine_is_janus2m()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EMBTF
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EMBTF
-# endif
-# define machine_is_embtf()	(machine_arch_type == MACH_TYPE_EMBTF)
-#else
-# define machine_is_embtf()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HPM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HPM
-# endif
-# define machine_is_hpm()	(machine_arch_type == MACH_TYPE_HPM)
-#else
-# define machine_is_hpm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK2410TK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMDK2410TK
-# endif
-# define machine_is_smdk2410tk()	(machine_arch_type == MACH_TYPE_SMDK2410TK)
-#else
-# define machine_is_smdk2410tk()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK2410AJ
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMDK2410AJ
-# endif
-# define machine_is_smdk2410aj()	(machine_arch_type == MACH_TYPE_SMDK2410AJ)
-#else
-# define machine_is_smdk2410aj()	(0)
-#endif
-
-#ifdef CONFIG_MACH_STREETRACER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STREETRACER
-# endif
-# define machine_is_streetracer()	(machine_arch_type == MACH_TYPE_STREETRACER)
-#else
-# define machine_is_streetracer()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EFRAME
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EFRAME
-# endif
-# define machine_is_eframe()	(machine_arch_type == MACH_TYPE_EFRAME)
-#else
-# define machine_is_eframe()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CSB337
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CSB337
-# endif
-# define machine_is_csb337()	(machine_arch_type == MACH_TYPE_CSB337)
-#else
-# define machine_is_csb337()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PXA_LARK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXA_LARK
-# endif
-# define machine_is_pxa_lark()	(machine_arch_type == MACH_TYPE_PXA_LARK)
-#else
-# define machine_is_pxa_lark()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PNP2110
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PNP2110
-# endif
-# define machine_is_pxa_pnp2110()	(machine_arch_type == MACH_TYPE_PNP2110)
-#else
-# define machine_is_pxa_pnp2110()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TCC72X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TCC72X
-# endif
-# define machine_is_tcc72x()	(machine_arch_type == MACH_TYPE_TCC72X)
-#else
-# define machine_is_tcc72x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ALTAIR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ALTAIR
-# endif
-# define machine_is_altair()	(machine_arch_type == MACH_TYPE_ALTAIR)
-#else
-# define machine_is_altair()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KC3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KC3
-# endif
-# define machine_is_kc3()	(machine_arch_type == MACH_TYPE_KC3)
-#else
-# define machine_is_kc3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SINTEFTD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SINTEFTD
-# endif
-# define machine_is_sinteftd()	(machine_arch_type == MACH_TYPE_SINTEFTD)
-#else
-# define machine_is_sinteftd()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MAINSTONE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MAINSTONE
-# endif
-# define machine_is_mainstone()	(machine_arch_type == MACH_TYPE_MAINSTONE)
-#else
-# define machine_is_mainstone()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ADAY4X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADAY4X
-# endif
-# define machine_is_aday4x()	(machine_arch_type == MACH_TYPE_ADAY4X)
-#else
-# define machine_is_aday4x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LITE300
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LITE300
-# endif
-# define machine_is_lite300()	(machine_arch_type == MACH_TYPE_LITE300)
-#else
-# define machine_is_lite300()	(0)
-#endif
-
-#ifdef CONFIG_MACH_S5C7376
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S5C7376
-# endif
-# define machine_is_s5c7376()	(machine_arch_type == MACH_TYPE_S5C7376)
-#else
-# define machine_is_s5c7376()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MT02
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MT02
-# endif
-# define machine_is_mt02()	(machine_arch_type == MACH_TYPE_MT02)
-#else
-# define machine_is_mt02()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MPORT3S
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MPORT3S
-# endif
-# define machine_is_mport3s()	(machine_arch_type == MACH_TYPE_MPORT3S)
-#else
-# define machine_is_mport3s()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RA_ALPHA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RA_ALPHA
-# endif
-# define machine_is_ra_alpha()	(machine_arch_type == MACH_TYPE_RA_ALPHA)
-#else
-# define machine_is_ra_alpha()	(0)
-#endif
-
-#ifdef CONFIG_MACH_XCEP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XCEP
-# endif
-# define machine_is_xcep()	(machine_arch_type == MACH_TYPE_XCEP)
-#else
-# define machine_is_xcep()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARCOM_VULCAN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARCOM_VULCAN
-# endif
-# define machine_is_arcom_vulcan()	(machine_arch_type == MACH_TYPE_ARCOM_VULCAN)
-#else
-# define machine_is_arcom_vulcan()	(0)
-#endif
-
-#ifdef CONFIG_MACH_STARGATE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STARGATE
-# endif
-# define machine_is_stargate()	(machine_arch_type == MACH_TYPE_STARGATE)
-#else
-# define machine_is_stargate()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARMADILLOJ
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARMADILLOJ
-# endif
-# define machine_is_armadilloj()	(machine_arch_type == MACH_TYPE_ARMADILLOJ)
-#else
-# define machine_is_armadilloj()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ELROY_JACK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ELROY_JACK
-# endif
-# define machine_is_elroy_jack()	(machine_arch_type == MACH_TYPE_ELROY_JACK)
-#else
-# define machine_is_elroy_jack()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BACKEND
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BACKEND
-# endif
-# define machine_is_backend()	(machine_arch_type == MACH_TYPE_BACKEND)
-#else
-# define machine_is_backend()	(0)
-#endif
-
-#ifdef CONFIG_MACH_S5LINBOX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S5LINBOX
-# endif
-# define machine_is_s5linbox()	(machine_arch_type == MACH_TYPE_S5LINBOX)
-#else
-# define machine_is_s5linbox()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NOMADIK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NOMADIK
-# endif
-# define machine_is_nomadik()	(machine_arch_type == MACH_TYPE_NOMADIK)
-#else
-# define machine_is_nomadik()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IA_CPU_9200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IA_CPU_9200
-# endif
-# define machine_is_ia_cpu_9200()	(machine_arch_type == MACH_TYPE_IA_CPU_9200)
-#else
-# define machine_is_ia_cpu_9200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91_BJA1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91_BJA1
-# endif
-# define machine_is_at91_bja1()	(machine_arch_type == MACH_TYPE_AT91_BJA1)
-#else
-# define machine_is_at91_bja1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CORGI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CORGI
-# endif
-# define machine_is_corgi()	(machine_arch_type == MACH_TYPE_CORGI)
-#else
-# define machine_is_corgi()	(0)
-#endif
-
-#ifdef CONFIG_MACH_POODLE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_POODLE
-# endif
-# define machine_is_poodle()	(machine_arch_type == MACH_TYPE_POODLE)
-#else
-# define machine_is_poodle()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TEN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TEN
-# endif
-# define machine_is_ten()	(machine_arch_type == MACH_TYPE_TEN)
-#else
-# define machine_is_ten()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ROVERP5P
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ROVERP5P
-# endif
-# define machine_is_roverp5p()	(machine_arch_type == MACH_TYPE_ROVERP5P)
-#else
-# define machine_is_roverp5p()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SC2700
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SC2700
-# endif
-# define machine_is_sc2700()	(machine_arch_type == MACH_TYPE_SC2700)
-#else
-# define machine_is_sc2700()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EX_EAGLE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EX_EAGLE
-# endif
-# define machine_is_ex_eagle()	(machine_arch_type == MACH_TYPE_EX_EAGLE)
-#else
-# define machine_is_ex_eagle()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NX_PXA12
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NX_PXA12
-# endif
-# define machine_is_nx_pxa12()	(machine_arch_type == MACH_TYPE_NX_PXA12)
-#else
-# define machine_is_nx_pxa12()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NX_PXA5
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NX_PXA5
-# endif
-# define machine_is_nx_pxa5()	(machine_arch_type == MACH_TYPE_NX_PXA5)
-#else
-# define machine_is_nx_pxa5()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BLACKBOARD2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BLACKBOARD2
-# endif
-# define machine_is_blackboard2()	(machine_arch_type == MACH_TYPE_BLACKBOARD2)
-#else
-# define machine_is_blackboard2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_I819
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_I819
-# endif
-# define machine_is_i819()	(machine_arch_type == MACH_TYPE_I819)
-#else
-# define machine_is_i819()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IXMB995E
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXMB995E
-# endif
-# define machine_is_ixmb995e()	(machine_arch_type == MACH_TYPE_IXMB995E)
-#else
-# define machine_is_ixmb995e()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SKYRIDER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SKYRIDER
-# endif
-# define machine_is_skyrider()	(machine_arch_type == MACH_TYPE_SKYRIDER)
-#else
-# define machine_is_skyrider()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SKYHAWK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SKYHAWK
-# endif
-# define machine_is_skyhawk()	(machine_arch_type == MACH_TYPE_SKYHAWK)
-#else
-# define machine_is_skyhawk()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ENTERPRISE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ENTERPRISE
-# endif
-# define machine_is_enterprise()	(machine_arch_type == MACH_TYPE_ENTERPRISE)
-#else
-# define machine_is_enterprise()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DEP2410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DEP2410
-# endif
-# define machine_is_dep2410()	(machine_arch_type == MACH_TYPE_DEP2410)
-#else
-# define machine_is_dep2410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARMCORE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARMCORE
-# endif
-# define machine_is_armcore()	(machine_arch_type == MACH_TYPE_ARMCORE)
-#else
-# define machine_is_armcore()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HOBBIT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HOBBIT
-# endif
-# define machine_is_hobbit()	(machine_arch_type == MACH_TYPE_HOBBIT)
-#else
-# define machine_is_hobbit()	(0)
-#endif
-
-#ifdef CONFIG_MACH_H7210
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_H7210
-# endif
-# define machine_is_h7210()	(machine_arch_type == MACH_TYPE_H7210)
-#else
-# define machine_is_h7210()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PXA_NETDCU5
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXA_NETDCU5
-# endif
-# define machine_is_pxa_netdcu5()	(machine_arch_type == MACH_TYPE_PXA_NETDCU5)
-#else
-# define machine_is_pxa_netdcu5()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ACC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ACC
-# endif
-# define machine_is_acc()	(machine_arch_type == MACH_TYPE_ACC)
-#else
-# define machine_is_acc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ESL_SARVA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ESL_SARVA
-# endif
-# define machine_is_esl_sarva()	(machine_arch_type == MACH_TYPE_ESL_SARVA)
-#else
-# define machine_is_esl_sarva()	(0)
-#endif
-
-#ifdef CONFIG_MACH_XM250
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XM250
-# endif
-# define machine_is_xm250()	(machine_arch_type == MACH_TYPE_XM250)
-#else
-# define machine_is_xm250()	(0)
-#endif
-
-#ifdef CONFIG_MACH_T6TC1XB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_T6TC1XB
-# endif
-# define machine_is_t6tc1xb()	(machine_arch_type == MACH_TYPE_T6TC1XB)
-#else
-# define machine_is_t6tc1xb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ESS710
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ESS710
-# endif
-# define machine_is_ess710()	(machine_arch_type == MACH_TYPE_ESS710)
-#else
-# define machine_is_ess710()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX31ADS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX31ADS
-# endif
-# define machine_is_mx31ads()	(machine_arch_type == MACH_TYPE_MX31ADS)
-#else
-# define machine_is_mx31ads()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HIMALAYA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HIMALAYA
-# endif
-# define machine_is_himalaya()	(machine_arch_type == MACH_TYPE_HIMALAYA)
-#else
-# define machine_is_himalaya()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BOLFENK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BOLFENK
-# endif
-# define machine_is_bolfenk()	(machine_arch_type == MACH_TYPE_BOLFENK)
-#else
-# define machine_is_bolfenk()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91RM9200KR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91RM9200KR
-# endif
-# define machine_is_at91rm9200kr()	(machine_arch_type == MACH_TYPE_AT91RM9200KR)
-#else
-# define machine_is_at91rm9200kr()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EDB9312
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EDB9312
-# endif
-# define machine_is_edb9312()	(machine_arch_type == MACH_TYPE_EDB9312)
-#else
-# define machine_is_edb9312()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_GENERIC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_GENERIC
-# endif
-# define machine_is_omap_generic()	(machine_arch_type == MACH_TYPE_OMAP_GENERIC)
-#else
-# define machine_is_omap_generic()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AXIMX3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AXIMX3
-# endif
-# define machine_is_aximx3()	(machine_arch_type == MACH_TYPE_AXIMX3)
-#else
-# define machine_is_aximx3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EB67XDIP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EB67XDIP
-# endif
-# define machine_is_eb67xdip()	(machine_arch_type == MACH_TYPE_EB67XDIP)
-#else
-# define machine_is_eb67xdip()	(0)
-#endif
-
-#ifdef CONFIG_MACH_WEBTXS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WEBTXS
-# endif
-# define machine_is_webtxs()	(machine_arch_type == MACH_TYPE_WEBTXS)
-#else
-# define machine_is_webtxs()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HAWK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HAWK
-# endif
-# define machine_is_hawk()	(machine_arch_type == MACH_TYPE_HAWK)
-#else
-# define machine_is_hawk()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CCAT91SBC001
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CCAT91SBC001
-# endif
-# define machine_is_ccat91sbc001()	(machine_arch_type == MACH_TYPE_CCAT91SBC001)
-#else
-# define machine_is_ccat91sbc001()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EXPRESSO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EXPRESSO
-# endif
-# define machine_is_expresso()	(machine_arch_type == MACH_TYPE_EXPRESSO)
-#else
-# define machine_is_expresso()	(0)
-#endif
-
-#ifdef CONFIG_MACH_H4000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_H4000
-# endif
-# define machine_is_h4000()	(machine_arch_type == MACH_TYPE_H4000)
-#else
-# define machine_is_h4000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DINO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DINO
-# endif
-# define machine_is_dino()	(machine_arch_type == MACH_TYPE_DINO)
-#else
-# define machine_is_dino()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ML675K
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ML675K
-# endif
-# define machine_is_ml675k()	(machine_arch_type == MACH_TYPE_ML675K)
-#else
-# define machine_is_ml675k()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EDB9301
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EDB9301
-# endif
-# define machine_is_edb9301()	(machine_arch_type == MACH_TYPE_EDB9301)
-#else
-# define machine_is_edb9301()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EDB9315
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EDB9315
-# endif
-# define machine_is_edb9315()	(machine_arch_type == MACH_TYPE_EDB9315)
-#else
-# define machine_is_edb9315()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RECIVA_TT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RECIVA_TT
-# endif
-# define machine_is_reciva_tt()	(machine_arch_type == MACH_TYPE_RECIVA_TT)
-#else
-# define machine_is_reciva_tt()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CSTCB01
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CSTCB01
-# endif
-# define machine_is_cstcb01()	(machine_arch_type == MACH_TYPE_CSTCB01)
-#else
-# define machine_is_cstcb01()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CSTCB1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CSTCB1
-# endif
-# define machine_is_cstcb1()	(machine_arch_type == MACH_TYPE_CSTCB1)
-#else
-# define machine_is_cstcb1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SHADWELL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SHADWELL
-# endif
-# define machine_is_shadwell()	(machine_arch_type == MACH_TYPE_SHADWELL)
-#else
-# define machine_is_shadwell()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GOEPEL263
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GOEPEL263
-# endif
-# define machine_is_goepel263()	(machine_arch_type == MACH_TYPE_GOEPEL263)
-#else
-# define machine_is_goepel263()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ACQ100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ACQ100
-# endif
-# define machine_is_acq100()	(machine_arch_type == MACH_TYPE_ACQ100)
-#else
-# define machine_is_acq100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX1FS2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX1FS2
-# endif
-# define machine_is_mx1fs2()	(machine_arch_type == MACH_TYPE_MX1FS2)
-#else
-# define machine_is_mx1fs2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HIPTOP_G1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HIPTOP_G1
-# endif
-# define machine_is_hiptop_g1()	(machine_arch_type == MACH_TYPE_HIPTOP_G1)
-#else
-# define machine_is_hiptop_g1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SPARKY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SPARKY
-# endif
-# define machine_is_sparky()	(machine_arch_type == MACH_TYPE_SPARKY)
-#else
-# define machine_is_sparky()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NS9750
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NS9750
-# endif
-# define machine_is_ns9750()	(machine_arch_type == MACH_TYPE_NS9750)
-#else
-# define machine_is_ns9750()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PHOENIX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PHOENIX
-# endif
-# define machine_is_phoenix()	(machine_arch_type == MACH_TYPE_PHOENIX)
-#else
-# define machine_is_phoenix()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VR1000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VR1000
-# endif
-# define machine_is_vr1000()	(machine_arch_type == MACH_TYPE_VR1000)
-#else
-# define machine_is_vr1000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DEISTERPXA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DEISTERPXA
-# endif
-# define machine_is_deisterpxa()	(machine_arch_type == MACH_TYPE_DEISTERPXA)
-#else
-# define machine_is_deisterpxa()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BCM1160
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BCM1160
-# endif
-# define machine_is_bcm1160()	(machine_arch_type == MACH_TYPE_BCM1160)
-#else
-# define machine_is_bcm1160()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PCM022
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PCM022
-# endif
-# define machine_is_pcm022()	(machine_arch_type == MACH_TYPE_PCM022)
-#else
-# define machine_is_pcm022()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ADSGCX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADSGCX
-# endif
-# define machine_is_adsgcx()	(machine_arch_type == MACH_TYPE_ADSGCX)
-#else
-# define machine_is_adsgcx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DREADNAUGHT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DREADNAUGHT
-# endif
-# define machine_is_dreadnaught()	(machine_arch_type == MACH_TYPE_DREADNAUGHT)
-#else
-# define machine_is_dreadnaught()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DM320
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DM320
-# endif
-# define machine_is_dm320()	(machine_arch_type == MACH_TYPE_DM320)
-#else
-# define machine_is_dm320()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MARKOV
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MARKOV
-# endif
-# define machine_is_markov()	(machine_arch_type == MACH_TYPE_MARKOV)
-#else
-# define machine_is_markov()	(0)
-#endif
-
-#ifdef CONFIG_MACH_COS7A400
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_COS7A400
-# endif
-# define machine_is_cos7a400()	(machine_arch_type == MACH_TYPE_COS7A400)
-#else
-# define machine_is_cos7a400()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MILANO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MILANO
-# endif
-# define machine_is_milano()	(machine_arch_type == MACH_TYPE_MILANO)
-#else
-# define machine_is_milano()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UE9328
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UE9328
-# endif
-# define machine_is_ue9328()	(machine_arch_type == MACH_TYPE_UE9328)
-#else
-# define machine_is_ue9328()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UEX255
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UEX255
-# endif
-# define machine_is_uex255()	(machine_arch_type == MACH_TYPE_UEX255)
-#else
-# define machine_is_uex255()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UE2410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UE2410
-# endif
-# define machine_is_ue2410()	(machine_arch_type == MACH_TYPE_UE2410)
-#else
-# define machine_is_ue2410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_A620
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_A620
-# endif
-# define machine_is_a620()	(machine_arch_type == MACH_TYPE_A620)
-#else
-# define machine_is_a620()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OCELOT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OCELOT
-# endif
-# define machine_is_ocelot()	(machine_arch_type == MACH_TYPE_OCELOT)
-#else
-# define machine_is_ocelot()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CHEETAH
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CHEETAH
-# endif
-# define machine_is_cheetah()	(machine_arch_type == MACH_TYPE_CHEETAH)
-#else
-# define machine_is_cheetah()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_PERSEUS2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_PERSEUS2
-# endif
-# define machine_is_omap_perseus2()	(machine_arch_type == MACH_TYPE_OMAP_PERSEUS2)
-#else
-# define machine_is_omap_perseus2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZVUE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZVUE
-# endif
-# define machine_is_zvue()	(machine_arch_type == MACH_TYPE_ZVUE)
-#else
-# define machine_is_zvue()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ROVERP1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ROVERP1
-# endif
-# define machine_is_roverp1()	(machine_arch_type == MACH_TYPE_ROVERP1)
-#else
-# define machine_is_roverp1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ASIDIAL2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ASIDIAL2
-# endif
-# define machine_is_asidial2()	(machine_arch_type == MACH_TYPE_ASIDIAL2)
-#else
-# define machine_is_asidial2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_S3C24A0
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S3C24A0
-# endif
-# define machine_is_s3c24a0()	(machine_arch_type == MACH_TYPE_S3C24A0)
-#else
-# define machine_is_s3c24a0()	(0)
-#endif
-
-#ifdef CONFIG_MACH_E800
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_E800
-# endif
-# define machine_is_e800()	(machine_arch_type == MACH_TYPE_E800)
-#else
-# define machine_is_e800()	(0)
-#endif
-
-#ifdef CONFIG_MACH_E750
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_E750
-# endif
-# define machine_is_e750()	(machine_arch_type == MACH_TYPE_E750)
-#else
-# define machine_is_e750()	(0)
-#endif
-
-#ifdef CONFIG_MACH_S3C5500
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S3C5500
-# endif
-# define machine_is_s3c5500()	(machine_arch_type == MACH_TYPE_S3C5500)
-#else
-# define machine_is_s3c5500()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK5500
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMDK5500
-# endif
-# define machine_is_smdk5500()	(machine_arch_type == MACH_TYPE_SMDK5500)
-#else
-# define machine_is_smdk5500()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SIGNALSYNC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SIGNALSYNC
-# endif
-# define machine_is_signalsync()	(machine_arch_type == MACH_TYPE_SIGNALSYNC)
-#else
-# define machine_is_signalsync()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NBC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NBC
-# endif
-# define machine_is_nbc()	(machine_arch_type == MACH_TYPE_NBC)
-#else
-# define machine_is_nbc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KODIAK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KODIAK
-# endif
-# define machine_is_kodiak()	(machine_arch_type == MACH_TYPE_KODIAK)
-#else
-# define machine_is_kodiak()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NETBOOKPRO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NETBOOKPRO
-# endif
-# define machine_is_netbookpro()	(machine_arch_type == MACH_TYPE_NETBOOKPRO)
-#else
-# define machine_is_netbookpro()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HW90200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HW90200
-# endif
-# define machine_is_hw90200()	(machine_arch_type == MACH_TYPE_HW90200)
-#else
-# define machine_is_hw90200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CONDOR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CONDOR
-# endif
-# define machine_is_condor()	(machine_arch_type == MACH_TYPE_CONDOR)
-#else
-# define machine_is_condor()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CUP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CUP
-# endif
-# define machine_is_cup()	(machine_arch_type == MACH_TYPE_CUP)
-#else
-# define machine_is_cup()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KITE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KITE
-# endif
-# define machine_is_kite()	(machine_arch_type == MACH_TYPE_KITE)
-#else
-# define machine_is_kite()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SCB9328
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SCB9328
-# endif
-# define machine_is_scb9328()	(machine_arch_type == MACH_TYPE_SCB9328)
-#else
-# define machine_is_scb9328()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_H3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_H3
-# endif
-# define machine_is_omap_h3()	(machine_arch_type == MACH_TYPE_OMAP_H3)
-#else
-# define machine_is_omap_h3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_H4
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_H4
-# endif
-# define machine_is_omap_h4()	(machine_arch_type == MACH_TYPE_OMAP_H4)
-#else
-# define machine_is_omap_h4()	(0)
-#endif
-
-#ifdef CONFIG_MACH_N10
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_N10
-# endif
-# define machine_is_n10()	(machine_arch_type == MACH_TYPE_N10)
-#else
-# define machine_is_n10()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MONTAJADE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MONTAJADE
-# endif
-# define machine_is_montejade()	(machine_arch_type == MACH_TYPE_MONTAJADE)
-#else
-# define machine_is_montejade()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SG560
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SG560
-# endif
-# define machine_is_sg560()	(machine_arch_type == MACH_TYPE_SG560)
-#else
-# define machine_is_sg560()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DP1000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DP1000
-# endif
-# define machine_is_dp1000()	(machine_arch_type == MACH_TYPE_DP1000)
-#else
-# define machine_is_dp1000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_OSK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_OSK
-# endif
-# define machine_is_omap_osk()	(machine_arch_type == MACH_TYPE_OMAP_OSK)
-#else
-# define machine_is_omap_osk()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RG100V3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RG100V3
-# endif
-# define machine_is_rg100v3()	(machine_arch_type == MACH_TYPE_RG100V3)
-#else
-# define machine_is_rg100v3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX2ADS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX2ADS
-# endif
-# define machine_is_mx2ads()	(machine_arch_type == MACH_TYPE_MX2ADS)
-#else
-# define machine_is_mx2ads()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PXA_KILO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXA_KILO
-# endif
-# define machine_is_pxa_kilo()	(machine_arch_type == MACH_TYPE_PXA_KILO)
-#else
-# define machine_is_pxa_kilo()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IXP4XX_EAGLE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXP4XX_EAGLE
-# endif
-# define machine_is_ixp4xx_eagle()	(machine_arch_type == MACH_TYPE_IXP4XX_EAGLE)
-#else
-# define machine_is_ixp4xx_eagle()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TOSA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TOSA
-# endif
-# define machine_is_tosa()	(machine_arch_type == MACH_TYPE_TOSA)
-#else
-# define machine_is_tosa()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MB2520F
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MB2520F
-# endif
-# define machine_is_mb2520f()	(machine_arch_type == MACH_TYPE_MB2520F)
-#else
-# define machine_is_mb2520f()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EMC1000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EMC1000
-# endif
-# define machine_is_emc1000()	(machine_arch_type == MACH_TYPE_EMC1000)
-#else
-# define machine_is_emc1000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TIDSC25
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TIDSC25
-# endif
-# define machine_is_tidsc25()	(machine_arch_type == MACH_TYPE_TIDSC25)
-#else
-# define machine_is_tidsc25()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AKCPMXL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AKCPMXL
-# endif
-# define machine_is_akcpmxl()	(machine_arch_type == MACH_TYPE_AKCPMXL)
-#else
-# define machine_is_akcpmxl()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AV3XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AV3XX
-# endif
-# define machine_is_av3xx()	(machine_arch_type == MACH_TYPE_AV3XX)
-#else
-# define machine_is_av3xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AVILA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AVILA
-# endif
-# define machine_is_avila()	(machine_arch_type == MACH_TYPE_AVILA)
-#else
-# define machine_is_avila()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PXA_MPM10
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXA_MPM10
-# endif
-# define machine_is_pxa_mpm10()	(machine_arch_type == MACH_TYPE_PXA_MPM10)
-#else
-# define machine_is_pxa_mpm10()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PXA_KYANITE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXA_KYANITE
-# endif
-# define machine_is_pxa_kyanite()	(machine_arch_type == MACH_TYPE_PXA_KYANITE)
-#else
-# define machine_is_pxa_kyanite()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SGOLD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SGOLD
-# endif
-# define machine_is_sgold()	(machine_arch_type == MACH_TYPE_SGOLD)
-#else
-# define machine_is_sgold()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OSCAR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OSCAR
-# endif
-# define machine_is_oscar()	(machine_arch_type == MACH_TYPE_OSCAR)
-#else
-# define machine_is_oscar()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EPXA4USB2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EPXA4USB2
-# endif
-# define machine_is_epxa4usb2()	(machine_arch_type == MACH_TYPE_EPXA4USB2)
-#else
-# define machine_is_epxa4usb2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_XSENGINE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XSENGINE
-# endif
-# define machine_is_xsengine()	(machine_arch_type == MACH_TYPE_XSENGINE)
-#else
-# define machine_is_xsengine()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IP600
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IP600
-# endif
-# define machine_is_ip600()	(machine_arch_type == MACH_TYPE_IP600)
-#else
-# define machine_is_ip600()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MCAN2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MCAN2
-# endif
-# define machine_is_mcan2()	(machine_arch_type == MACH_TYPE_MCAN2)
-#else
-# define machine_is_mcan2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DDI_BLUERIDGE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DDI_BLUERIDGE
-# endif
-# define machine_is_ddi_blueridge()	(machine_arch_type == MACH_TYPE_DDI_BLUERIDGE)
-#else
-# define machine_is_ddi_blueridge()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SKYMINDER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SKYMINDER
-# endif
-# define machine_is_skyminder()	(machine_arch_type == MACH_TYPE_SKYMINDER)
-#else
-# define machine_is_skyminder()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LPD79520
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LPD79520
-# endif
-# define machine_is_lpd79520()	(machine_arch_type == MACH_TYPE_LPD79520)
-#else
-# define machine_is_lpd79520()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EDB9302
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EDB9302
-# endif
-# define machine_is_edb9302()	(machine_arch_type == MACH_TYPE_EDB9302)
-#else
-# define machine_is_edb9302()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HW90340
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HW90340
-# endif
-# define machine_is_hw90340()	(machine_arch_type == MACH_TYPE_HW90340)
-#else
-# define machine_is_hw90340()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CIP_BOX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CIP_BOX
-# endif
-# define machine_is_cip_box()	(machine_arch_type == MACH_TYPE_CIP_BOX)
-#else
-# define machine_is_cip_box()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IVPN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IVPN
-# endif
-# define machine_is_ivpn()	(machine_arch_type == MACH_TYPE_IVPN)
-#else
-# define machine_is_ivpn()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RSOC2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RSOC2
-# endif
-# define machine_is_rsoc2()	(machine_arch_type == MACH_TYPE_RSOC2)
-#else
-# define machine_is_rsoc2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HUSKY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HUSKY
-# endif
-# define machine_is_husky()	(machine_arch_type == MACH_TYPE_HUSKY)
-#else
-# define machine_is_husky()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BOXER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BOXER
-# endif
-# define machine_is_boxer()	(machine_arch_type == MACH_TYPE_BOXER)
-#else
-# define machine_is_boxer()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SHEPHERD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SHEPHERD
-# endif
-# define machine_is_shepherd()	(machine_arch_type == MACH_TYPE_SHEPHERD)
-#else
-# define machine_is_shepherd()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AML42800AA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AML42800AA
-# endif
-# define machine_is_aml42800aa()	(machine_arch_type == MACH_TYPE_AML42800AA)
-#else
-# define machine_is_aml42800aa()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LPC2294
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LPC2294
-# endif
-# define machine_is_lpc2294()	(machine_arch_type == MACH_TYPE_LPC2294)
-#else
-# define machine_is_lpc2294()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SWITCHGRASS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SWITCHGRASS
-# endif
-# define machine_is_switchgrass()	(machine_arch_type == MACH_TYPE_SWITCHGRASS)
-#else
-# define machine_is_switchgrass()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ENS_CMU
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ENS_CMU
-# endif
-# define machine_is_ens_cmu()	(machine_arch_type == MACH_TYPE_ENS_CMU)
-#else
-# define machine_is_ens_cmu()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MM6_SDB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MM6_SDB
-# endif
-# define machine_is_mm6_sdb()	(machine_arch_type == MACH_TYPE_MM6_SDB)
-#else
-# define machine_is_mm6_sdb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SATURN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SATURN
-# endif
-# define machine_is_saturn()	(machine_arch_type == MACH_TYPE_SATURN)
-#else
-# define machine_is_saturn()	(0)
-#endif
-
-#ifdef CONFIG_MACH_I30030EVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_I30030EVB
-# endif
-# define machine_is_i30030evb()	(machine_arch_type == MACH_TYPE_I30030EVB)
-#else
-# define machine_is_i30030evb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MXC27530EVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MXC27530EVB
-# endif
-# define machine_is_mxc27530evb()	(machine_arch_type == MACH_TYPE_MXC27530EVB)
-#else
-# define machine_is_mxc27530evb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK2800
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMDK2800
-# endif
-# define machine_is_smdk2800()	(machine_arch_type == MACH_TYPE_SMDK2800)
-#else
-# define machine_is_smdk2800()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MTWILSON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MTWILSON
-# endif
-# define machine_is_mtwilson()	(machine_arch_type == MACH_TYPE_MTWILSON)
-#else
-# define machine_is_mtwilson()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZITI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZITI
-# endif
-# define machine_is_ziti()	(machine_arch_type == MACH_TYPE_ZITI)
-#else
-# define machine_is_ziti()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GRANDFATHER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GRANDFATHER
-# endif
-# define machine_is_grandfather()	(machine_arch_type == MACH_TYPE_GRANDFATHER)
-#else
-# define machine_is_grandfather()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TENGINE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TENGINE
-# endif
-# define machine_is_tengine()	(machine_arch_type == MACH_TYPE_TENGINE)
-#else
-# define machine_is_tengine()	(0)
-#endif
-
-#ifdef CONFIG_MACH_S3C2460
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S3C2460
-# endif
-# define machine_is_s3c2460()	(machine_arch_type == MACH_TYPE_S3C2460)
-#else
-# define machine_is_s3c2460()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PDM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PDM
-# endif
-# define machine_is_pdm()	(machine_arch_type == MACH_TYPE_PDM)
-#else
-# define machine_is_pdm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_H4700
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_H4700
-# endif
-# define machine_is_h4700()	(machine_arch_type == MACH_TYPE_H4700)
-#else
-# define machine_is_h4700()	(0)
-#endif
-
-#ifdef CONFIG_MACH_H6300
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_H6300
-# endif
-# define machine_is_h6300()	(machine_arch_type == MACH_TYPE_H6300)
-#else
-# define machine_is_h6300()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RZ1700
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RZ1700
-# endif
-# define machine_is_rz1700()	(machine_arch_type == MACH_TYPE_RZ1700)
-#else
-# define machine_is_rz1700()	(0)
-#endif
-
-#ifdef CONFIG_MACH_A716
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_A716
-# endif
-# define machine_is_a716()	(machine_arch_type == MACH_TYPE_A716)
-#else
-# define machine_is_a716()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ESTK2440A
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ESTK2440A
-# endif
-# define machine_is_estk2440a()	(machine_arch_type == MACH_TYPE_ESTK2440A)
-#else
-# define machine_is_estk2440a()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ATWIXP425
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ATWIXP425
-# endif
-# define machine_is_atwixp425()	(machine_arch_type == MACH_TYPE_ATWIXP425)
-#else
-# define machine_is_atwixp425()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CSB336
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CSB336
-# endif
-# define machine_is_csb336()	(machine_arch_type == MACH_TYPE_CSB336)
-#else
-# define machine_is_csb336()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RIRM2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RIRM2
-# endif
-# define machine_is_rirm2()	(machine_arch_type == MACH_TYPE_RIRM2)
-#else
-# define machine_is_rirm2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CX23518
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CX23518
-# endif
-# define machine_is_cx23518()	(machine_arch_type == MACH_TYPE_CX23518)
-#else
-# define machine_is_cx23518()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CX2351X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CX2351X
-# endif
-# define machine_is_cx2351x()	(machine_arch_type == MACH_TYPE_CX2351X)
-#else
-# define machine_is_cx2351x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_COMPUTIME
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_COMPUTIME
-# endif
-# define machine_is_computime()	(machine_arch_type == MACH_TYPE_COMPUTIME)
-#else
-# define machine_is_computime()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IZARUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IZARUS
-# endif
-# define machine_is_izarus()	(machine_arch_type == MACH_TYPE_IZARUS)
-#else
-# define machine_is_izarus()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RTS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RTS
-# endif
-# define machine_is_pxa_rts()	(machine_arch_type == MACH_TYPE_RTS)
-#else
-# define machine_is_pxa_rts()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SE5100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SE5100
-# endif
-# define machine_is_se5100()	(machine_arch_type == MACH_TYPE_SE5100)
-#else
-# define machine_is_se5100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_S3C2510
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S3C2510
-# endif
-# define machine_is_s3c2510()	(machine_arch_type == MACH_TYPE_S3C2510)
-#else
-# define machine_is_s3c2510()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CSB437TL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CSB437TL
-# endif
-# define machine_is_csb437tl()	(machine_arch_type == MACH_TYPE_CSB437TL)
-#else
-# define machine_is_csb437tl()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SLAUSON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SLAUSON
-# endif
-# define machine_is_slauson()	(machine_arch_type == MACH_TYPE_SLAUSON)
-#else
-# define machine_is_slauson()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PEARLRIVER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PEARLRIVER
-# endif
-# define machine_is_pearlriver()	(machine_arch_type == MACH_TYPE_PEARLRIVER)
-#else
-# define machine_is_pearlriver()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TDC_P210
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TDC_P210
-# endif
-# define machine_is_tdc_p210()	(machine_arch_type == MACH_TYPE_TDC_P210)
-#else
-# define machine_is_tdc_p210()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SG580
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SG580
-# endif
-# define machine_is_sg580()	(machine_arch_type == MACH_TYPE_SG580)
-#else
-# define machine_is_sg580()	(0)
-#endif
-
-#ifdef CONFIG_MACH_WRSBCARM7
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WRSBCARM7
-# endif
-# define machine_is_wrsbcarm7()	(machine_arch_type == MACH_TYPE_WRSBCARM7)
-#else
-# define machine_is_wrsbcarm7()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IPD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IPD
-# endif
-# define machine_is_ipd()	(machine_arch_type == MACH_TYPE_IPD)
-#else
-# define machine_is_ipd()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PXA_DNP2110
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXA_DNP2110
-# endif
-# define machine_is_pxa_dnp2110()	(machine_arch_type == MACH_TYPE_PXA_DNP2110)
-#else
-# define machine_is_pxa_dnp2110()	(0)
-#endif
-
-#ifdef CONFIG_MACH_XAENIAX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XAENIAX
-# endif
-# define machine_is_xaeniax()	(machine_arch_type == MACH_TYPE_XAENIAX)
-#else
-# define machine_is_xaeniax()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SOMN4250
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SOMN4250
-# endif
-# define machine_is_somn4250()	(machine_arch_type == MACH_TYPE_SOMN4250)
-#else
-# define machine_is_somn4250()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PLEB2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PLEB2
-# endif
-# define machine_is_pleb2()	(machine_arch_type == MACH_TYPE_PLEB2)
-#else
-# define machine_is_pleb2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CORNWALLIS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CORNWALLIS
-# endif
-# define machine_is_cornwallis()	(machine_arch_type == MACH_TYPE_CORNWALLIS)
-#else
-# define machine_is_cornwallis()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GURNEY_DRV
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GURNEY_DRV
-# endif
-# define machine_is_gurney_drv()	(machine_arch_type == MACH_TYPE_GURNEY_DRV)
-#else
-# define machine_is_gurney_drv()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CHAFFEE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CHAFFEE
-# endif
-# define machine_is_chaffee()	(machine_arch_type == MACH_TYPE_CHAFFEE)
-#else
-# define machine_is_chaffee()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RMS101
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RMS101
-# endif
-# define machine_is_rms101()	(machine_arch_type == MACH_TYPE_RMS101)
-#else
-# define machine_is_rms101()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RX3715
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RX3715
-# endif
-# define machine_is_rx3715()	(machine_arch_type == MACH_TYPE_RX3715)
-#else
-# define machine_is_rx3715()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SWIFT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SWIFT
-# endif
-# define machine_is_swift()	(machine_arch_type == MACH_TYPE_SWIFT)
-#else
-# define machine_is_swift()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ROVERP7
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ROVERP7
-# endif
-# define machine_is_roverp7()	(machine_arch_type == MACH_TYPE_ROVERP7)
-#else
-# define machine_is_roverp7()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PR818S
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PR818S
-# endif
-# define machine_is_pr818s()	(machine_arch_type == MACH_TYPE_PR818S)
-#else
-# define machine_is_pr818s()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TRXPRO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TRXPRO
-# endif
-# define machine_is_trxpro()	(machine_arch_type == MACH_TYPE_TRXPRO)
-#else
-# define machine_is_trxpro()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NSLU2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NSLU2
-# endif
-# define machine_is_nslu2()	(machine_arch_type == MACH_TYPE_NSLU2)
-#else
-# define machine_is_nslu2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_E400
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_E400
-# endif
-# define machine_is_e400()	(machine_arch_type == MACH_TYPE_E400)
-#else
-# define machine_is_e400()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TRAB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TRAB
-# endif
-# define machine_is_trab()	(machine_arch_type == MACH_TYPE_TRAB)
-#else
-# define machine_is_trab()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CMC_PU2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CMC_PU2
-# endif
-# define machine_is_cmc_pu2()	(machine_arch_type == MACH_TYPE_CMC_PU2)
-#else
-# define machine_is_cmc_pu2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FULCRUM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FULCRUM
-# endif
-# define machine_is_fulcrum()	(machine_arch_type == MACH_TYPE_FULCRUM)
-#else
-# define machine_is_fulcrum()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NETGATE42X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NETGATE42X
-# endif
-# define machine_is_netgate42x()	(machine_arch_type == MACH_TYPE_NETGATE42X)
-#else
-# define machine_is_netgate42x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_STR710
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STR710
-# endif
-# define machine_is_str710()	(machine_arch_type == MACH_TYPE_STR710)
-#else
-# define machine_is_str710()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IXDPG425
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXDPG425
-# endif
-# define machine_is_ixdpg425()	(machine_arch_type == MACH_TYPE_IXDPG425)
-#else
-# define machine_is_ixdpg425()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TOMTOMGO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TOMTOMGO
-# endif
-# define machine_is_tomtomgo()	(machine_arch_type == MACH_TYPE_TOMTOMGO)
-#else
-# define machine_is_tomtomgo()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VERSATILE_AB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VERSATILE_AB
-# endif
-# define machine_is_versatile_ab()	(machine_arch_type == MACH_TYPE_VERSATILE_AB)
-#else
-# define machine_is_versatile_ab()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EDB9307
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EDB9307
-# endif
-# define machine_is_edb9307()	(machine_arch_type == MACH_TYPE_EDB9307)
-#else
-# define machine_is_edb9307()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SG565
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SG565
-# endif
-# define machine_is_sg565()	(machine_arch_type == MACH_TYPE_SG565)
-#else
-# define machine_is_sg565()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LPD79524
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LPD79524
-# endif
-# define machine_is_lpd79524()	(machine_arch_type == MACH_TYPE_LPD79524)
-#else
-# define machine_is_lpd79524()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LPD79525
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LPD79525
-# endif
-# define machine_is_lpd79525()	(machine_arch_type == MACH_TYPE_LPD79525)
-#else
-# define machine_is_lpd79525()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RMS100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RMS100
-# endif
-# define machine_is_rms100()	(machine_arch_type == MACH_TYPE_RMS100)
-#else
-# define machine_is_rms100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KB9200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KB9200
-# endif
-# define machine_is_kb9200()	(machine_arch_type == MACH_TYPE_KB9200)
-#else
-# define machine_is_kb9200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SX1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SX1
-# endif
-# define machine_is_sx1()	(machine_arch_type == MACH_TYPE_SX1)
-#else
-# define machine_is_sx1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HMS39C7092
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HMS39C7092
-# endif
-# define machine_is_hms39c7092()	(machine_arch_type == MACH_TYPE_HMS39C7092)
-#else
-# define machine_is_hms39c7092()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARMADILLO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARMADILLO
-# endif
-# define machine_is_armadillo()	(machine_arch_type == MACH_TYPE_ARMADILLO)
-#else
-# define machine_is_armadillo()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IPCU
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IPCU
-# endif
-# define machine_is_ipcu()	(machine_arch_type == MACH_TYPE_IPCU)
-#else
-# define machine_is_ipcu()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LOOX720
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LOOX720
-# endif
-# define machine_is_loox720()	(machine_arch_type == MACH_TYPE_LOOX720)
-#else
-# define machine_is_loox720()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IXDP465
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXDP465
-# endif
-# define machine_is_ixdp465()	(machine_arch_type == MACH_TYPE_IXDP465)
-#else
-# define machine_is_ixdp465()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IXDP2351
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXDP2351
-# endif
-# define machine_is_ixdp2351()	(machine_arch_type == MACH_TYPE_IXDP2351)
-#else
-# define machine_is_ixdp2351()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ADSVIX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADSVIX
-# endif
-# define machine_is_adsvix()	(machine_arch_type == MACH_TYPE_ADSVIX)
-#else
-# define machine_is_adsvix()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DM270
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DM270
-# endif
-# define machine_is_dm270()	(machine_arch_type == MACH_TYPE_DM270)
-#else
-# define machine_is_dm270()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SOCLTPLUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SOCLTPLUS
-# endif
-# define machine_is_socltplus()	(machine_arch_type == MACH_TYPE_SOCLTPLUS)
-#else
-# define machine_is_socltplus()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ECIA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ECIA
-# endif
-# define machine_is_ecia()	(machine_arch_type == MACH_TYPE_ECIA)
-#else
-# define machine_is_ecia()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CM4008
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CM4008
-# endif
-# define machine_is_cm4008()	(machine_arch_type == MACH_TYPE_CM4008)
-#else
-# define machine_is_cm4008()	(0)
-#endif
-
-#ifdef CONFIG_MACH_P2001
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_P2001
-# endif
-# define machine_is_p2001()	(machine_arch_type == MACH_TYPE_P2001)
-#else
-# define machine_is_p2001()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TWISTER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TWISTER
-# endif
-# define machine_is_twister()	(machine_arch_type == MACH_TYPE_TWISTER)
-#else
-# define machine_is_twister()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MUDSHARK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MUDSHARK
-# endif
-# define machine_is_mudshark()	(machine_arch_type == MACH_TYPE_MUDSHARK)
-#else
-# define machine_is_mudshark()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HB2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HB2
-# endif
-# define machine_is_hb2()	(machine_arch_type == MACH_TYPE_HB2)
-#else
-# define machine_is_hb2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IQ80332
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IQ80332
-# endif
-# define machine_is_iq80332()	(machine_arch_type == MACH_TYPE_IQ80332)
-#else
-# define machine_is_iq80332()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SENDT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SENDT
-# endif
-# define machine_is_sendt()	(machine_arch_type == MACH_TYPE_SENDT)
-#else
-# define machine_is_sendt()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX2JAZZ
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX2JAZZ
-# endif
-# define machine_is_mx2jazz()	(machine_arch_type == MACH_TYPE_MX2JAZZ)
-#else
-# define machine_is_mx2jazz()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MULTIIO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MULTIIO
-# endif
-# define machine_is_multiio()	(machine_arch_type == MACH_TYPE_MULTIIO)
-#else
-# define machine_is_multiio()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HRDISPLAY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HRDISPLAY
-# endif
-# define machine_is_hrdisplay()	(machine_arch_type == MACH_TYPE_HRDISPLAY)
-#else
-# define machine_is_hrdisplay()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MXC27530ADS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MXC27530ADS
-# endif
-# define machine_is_mxc27530ads()	(machine_arch_type == MACH_TYPE_MXC27530ADS)
-#else
-# define machine_is_mxc27530ads()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TRIZEPS3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TRIZEPS3
-# endif
-# define machine_is_trizeps3()	(machine_arch_type == MACH_TYPE_TRIZEPS3)
-#else
-# define machine_is_trizeps3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZEFEERDZA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZEFEERDZA
-# endif
-# define machine_is_zefeerdza()	(machine_arch_type == MACH_TYPE_ZEFEERDZA)
-#else
-# define machine_is_zefeerdza()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZEFEERDZB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZEFEERDZB
-# endif
-# define machine_is_zefeerdzb()	(machine_arch_type == MACH_TYPE_ZEFEERDZB)
-#else
-# define machine_is_zefeerdzb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZEFEERDZG
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZEFEERDZG
-# endif
-# define machine_is_zefeerdzg()	(machine_arch_type == MACH_TYPE_ZEFEERDZG)
-#else
-# define machine_is_zefeerdzg()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZEFEERDZN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZEFEERDZN
-# endif
-# define machine_is_zefeerdzn()	(machine_arch_type == MACH_TYPE_ZEFEERDZN)
-#else
-# define machine_is_zefeerdzn()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZEFEERDZQ
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZEFEERDZQ
-# endif
-# define machine_is_zefeerdzq()	(machine_arch_type == MACH_TYPE_ZEFEERDZQ)
-#else
-# define machine_is_zefeerdzq()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GTWX5715
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GTWX5715
-# endif
-# define machine_is_gtwx5715()	(machine_arch_type == MACH_TYPE_GTWX5715)
-#else
-# define machine_is_gtwx5715()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ASTRO_JACK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ASTRO_JACK
-# endif
-# define machine_is_astro_jack()	(machine_arch_type == MACH_TYPE_ASTRO_JACK)
-#else
-# define machine_is_astro_jack()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TIP03
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TIP03
-# endif
-# define machine_is_tip03()	(machine_arch_type == MACH_TYPE_TIP03)
-#else
-# define machine_is_tip03()	(0)
-#endif
-
-#ifdef CONFIG_MACH_A9200EC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_A9200EC
-# endif
-# define machine_is_a9200ec()	(machine_arch_type == MACH_TYPE_A9200EC)
-#else
-# define machine_is_a9200ec()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PNX0105
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PNX0105
-# endif
-# define machine_is_pnx0105()	(machine_arch_type == MACH_TYPE_PNX0105)
-#else
-# define machine_is_pnx0105()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ADCPOECPU
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADCPOECPU
-# endif
-# define machine_is_adcpoecpu()	(machine_arch_type == MACH_TYPE_ADCPOECPU)
-#else
-# define machine_is_adcpoecpu()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CSB637
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CSB637
-# endif
-# define machine_is_csb637()	(machine_arch_type == MACH_TYPE_CSB637)
-#else
-# define machine_is_csb637()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MB9200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MB9200
-# endif
-# define machine_is_mb9200()	(machine_arch_type == MACH_TYPE_MB9200)
-#else
-# define machine_is_mb9200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KULUN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KULUN
-# endif
-# define machine_is_kulun()	(machine_arch_type == MACH_TYPE_KULUN)
-#else
-# define machine_is_kulun()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SNAPPER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SNAPPER
-# endif
-# define machine_is_snapper()	(machine_arch_type == MACH_TYPE_SNAPPER)
-#else
-# define machine_is_snapper()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OPTIMA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OPTIMA
-# endif
-# define machine_is_optima()	(machine_arch_type == MACH_TYPE_OPTIMA)
-#else
-# define machine_is_optima()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DLHSBC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DLHSBC
-# endif
-# define machine_is_dlhsbc()	(machine_arch_type == MACH_TYPE_DLHSBC)
-#else
-# define machine_is_dlhsbc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_X30
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_X30
-# endif
-# define machine_is_x30()	(machine_arch_type == MACH_TYPE_X30)
-#else
-# define machine_is_x30()	(0)
-#endif
-
-#ifdef CONFIG_MACH_N30
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_N30
-# endif
-# define machine_is_n30()	(machine_arch_type == MACH_TYPE_N30)
-#else
-# define machine_is_n30()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MANGA_KS8695
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MANGA_KS8695
-# endif
-# define machine_is_manga_ks8695()	(machine_arch_type == MACH_TYPE_MANGA_KS8695)
-#else
-# define machine_is_manga_ks8695()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AJAX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AJAX
-# endif
-# define machine_is_ajax()	(machine_arch_type == MACH_TYPE_AJAX)
-#else
-# define machine_is_ajax()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NEC_MP900
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NEC_MP900
-# endif
-# define machine_is_nec_mp900()	(machine_arch_type == MACH_TYPE_NEC_MP900)
-#else
-# define machine_is_nec_mp900()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VVTK1000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VVTK1000
-# endif
-# define machine_is_vvtk1000()	(machine_arch_type == MACH_TYPE_VVTK1000)
-#else
-# define machine_is_vvtk1000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KAFA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KAFA
-# endif
-# define machine_is_kafa()	(machine_arch_type == MACH_TYPE_KAFA)
-#else
-# define machine_is_kafa()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VVTK3000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VVTK3000
-# endif
-# define machine_is_vvtk3000()	(machine_arch_type == MACH_TYPE_VVTK3000)
-#else
-# define machine_is_vvtk3000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PIMX1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PIMX1
-# endif
-# define machine_is_pimx1()	(machine_arch_type == MACH_TYPE_PIMX1)
-#else
-# define machine_is_pimx1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OLLIE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OLLIE
-# endif
-# define machine_is_ollie()	(machine_arch_type == MACH_TYPE_OLLIE)
-#else
-# define machine_is_ollie()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SKYMAX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SKYMAX
-# endif
-# define machine_is_skymax()	(machine_arch_type == MACH_TYPE_SKYMAX)
-#else
-# define machine_is_skymax()	(0)
-#endif
-
-#ifdef CONFIG_MACH_JAZZ
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_JAZZ
-# endif
-# define machine_is_jazz()	(machine_arch_type == MACH_TYPE_JAZZ)
-#else
-# define machine_is_jazz()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TEL_T3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TEL_T3
-# endif
-# define machine_is_tel_t3()	(machine_arch_type == MACH_TYPE_TEL_T3)
-#else
-# define machine_is_tel_t3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AISINO_FCR255
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AISINO_FCR255
-# endif
-# define machine_is_aisino_fcr255()	(machine_arch_type == MACH_TYPE_AISINO_FCR255)
-#else
-# define machine_is_aisino_fcr255()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BTWEB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BTWEB
-# endif
-# define machine_is_btweb()	(machine_arch_type == MACH_TYPE_BTWEB)
-#else
-# define machine_is_btweb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DBG_LH79520
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DBG_LH79520
-# endif
-# define machine_is_dbg_lh79520()	(machine_arch_type == MACH_TYPE_DBG_LH79520)
-#else
-# define machine_is_dbg_lh79520()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CM41XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CM41XX
-# endif
-# define machine_is_cm41xx()	(machine_arch_type == MACH_TYPE_CM41XX)
-#else
-# define machine_is_cm41xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TS72XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TS72XX
-# endif
-# define machine_is_ts72xx()	(machine_arch_type == MACH_TYPE_TS72XX)
-#else
-# define machine_is_ts72xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NGGPXA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NGGPXA
-# endif
-# define machine_is_nggpxa()	(machine_arch_type == MACH_TYPE_NGGPXA)
-#else
-# define machine_is_nggpxa()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CSB535
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CSB535
-# endif
-# define machine_is_csb535()	(machine_arch_type == MACH_TYPE_CSB535)
-#else
-# define machine_is_csb535()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CSB536
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CSB536
-# endif
-# define machine_is_csb536()	(machine_arch_type == MACH_TYPE_CSB536)
-#else
-# define machine_is_csb536()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PXA_TRAKPOD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXA_TRAKPOD
-# endif
-# define machine_is_pxa_trakpod()	(machine_arch_type == MACH_TYPE_PXA_TRAKPOD)
-#else
-# define machine_is_pxa_trakpod()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PRAXIS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PRAXIS
-# endif
-# define machine_is_praxis()	(machine_arch_type == MACH_TYPE_PRAXIS)
-#else
-# define machine_is_praxis()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LH75411
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LH75411
-# endif
-# define machine_is_lh75411()	(machine_arch_type == MACH_TYPE_LH75411)
-#else
-# define machine_is_lh75411()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OTOM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OTOM
-# endif
-# define machine_is_otom()	(machine_arch_type == MACH_TYPE_OTOM)
-#else
-# define machine_is_otom()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NEXCODER_2440
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NEXCODER_2440
-# endif
-# define machine_is_nexcoder_2440()	(machine_arch_type == MACH_TYPE_NEXCODER_2440)
-#else
-# define machine_is_nexcoder_2440()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LOOX410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LOOX410
-# endif
-# define machine_is_loox410()	(machine_arch_type == MACH_TYPE_LOOX410)
-#else
-# define machine_is_loox410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_WESTLAKE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WESTLAKE
-# endif
-# define machine_is_westlake()	(machine_arch_type == MACH_TYPE_WESTLAKE)
-#else
-# define machine_is_westlake()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NSB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NSB
-# endif
-# define machine_is_nsb()	(machine_arch_type == MACH_TYPE_NSB)
-#else
-# define machine_is_nsb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ESL_SARVA_STN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ESL_SARVA_STN
-# endif
-# define machine_is_esl_sarva_stn()	(machine_arch_type == MACH_TYPE_ESL_SARVA_STN)
-#else
-# define machine_is_esl_sarva_stn()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ESL_SARVA_TFT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ESL_SARVA_TFT
-# endif
-# define machine_is_esl_sarva_tft()	(machine_arch_type == MACH_TYPE_ESL_SARVA_TFT)
-#else
-# define machine_is_esl_sarva_tft()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ESL_SARVA_IAD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ESL_SARVA_IAD
-# endif
-# define machine_is_esl_sarva_iad()	(machine_arch_type == MACH_TYPE_ESL_SARVA_IAD)
-#else
-# define machine_is_esl_sarva_iad()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ESL_SARVA_ACC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ESL_SARVA_ACC
-# endif
-# define machine_is_esl_sarva_acc()	(machine_arch_type == MACH_TYPE_ESL_SARVA_ACC)
-#else
-# define machine_is_esl_sarva_acc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TYPHOON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TYPHOON
-# endif
-# define machine_is_typhoon()	(machine_arch_type == MACH_TYPE_TYPHOON)
-#else
-# define machine_is_typhoon()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CNAV
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CNAV
-# endif
-# define machine_is_cnav()	(machine_arch_type == MACH_TYPE_CNAV)
-#else
-# define machine_is_cnav()	(0)
-#endif
-
-#ifdef CONFIG_MACH_A730
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_A730
-# endif
-# define machine_is_a730()	(machine_arch_type == MACH_TYPE_A730)
-#else
-# define machine_is_a730()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NETSTAR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NETSTAR
-# endif
-# define machine_is_netstar()	(machine_arch_type == MACH_TYPE_NETSTAR)
-#else
-# define machine_is_netstar()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PHASEFALE_SUPERCON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PHASEFALE_SUPERCON
-# endif
-# define machine_is_supercon()	(machine_arch_type == MACH_TYPE_PHASEFALE_SUPERCON)
-#else
-# define machine_is_supercon()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SHIVA1100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SHIVA1100
-# endif
-# define machine_is_shiva1100()	(machine_arch_type == MACH_TYPE_SHIVA1100)
-#else
-# define machine_is_shiva1100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ETEXSC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ETEXSC
-# endif
-# define machine_is_etexsc()	(machine_arch_type == MACH_TYPE_ETEXSC)
-#else
-# define machine_is_etexsc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IXDPG465
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXDPG465
-# endif
-# define machine_is_ixdpg465()	(machine_arch_type == MACH_TYPE_IXDPG465)
-#else
-# define machine_is_ixdpg465()	(0)
-#endif
-
-#ifdef CONFIG_MACH_A9M2410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_A9M2410
-# endif
-# define machine_is_a9m2410()	(machine_arch_type == MACH_TYPE_A9M2410)
-#else
-# define machine_is_a9m2410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_A9M2440
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_A9M2440
-# endif
-# define machine_is_a9m2440()	(machine_arch_type == MACH_TYPE_A9M2440)
-#else
-# define machine_is_a9m2440()	(0)
-#endif
-
-#ifdef CONFIG_MACH_A9M9750
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_A9M9750
-# endif
-# define machine_is_a9m9750()	(machine_arch_type == MACH_TYPE_A9M9750)
-#else
-# define machine_is_a9m9750()	(0)
-#endif
-
-#ifdef CONFIG_MACH_A9M9360
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_A9M9360
-# endif
-# define machine_is_a9m9360()	(machine_arch_type == MACH_TYPE_A9M9360)
-#else
-# define machine_is_a9m9360()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UNC90
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UNC90
-# endif
-# define machine_is_unc90()	(machine_arch_type == MACH_TYPE_UNC90)
-#else
-# define machine_is_unc90()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ECO920
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ECO920
-# endif
-# define machine_is_eco920()	(machine_arch_type == MACH_TYPE_ECO920)
-#else
-# define machine_is_eco920()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SATVIEW
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SATVIEW
-# endif
-# define machine_is_satview()	(machine_arch_type == MACH_TYPE_SATVIEW)
-#else
-# define machine_is_satview()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ROADRUNNER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ROADRUNNER
-# endif
-# define machine_is_roadrunner()	(machine_arch_type == MACH_TYPE_ROADRUNNER)
-#else
-# define machine_is_roadrunner()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91RM9200EK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91RM9200EK
-# endif
-# define machine_is_at91rm9200ek()	(machine_arch_type == MACH_TYPE_AT91RM9200EK)
-#else
-# define machine_is_at91rm9200ek()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GP32
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GP32
-# endif
-# define machine_is_gp32()	(machine_arch_type == MACH_TYPE_GP32)
-#else
-# define machine_is_gp32()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GEM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GEM
-# endif
-# define machine_is_gem()	(machine_arch_type == MACH_TYPE_GEM)
-#else
-# define machine_is_gem()	(0)
-#endif
-
-#ifdef CONFIG_MACH_I858
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_I858
-# endif
-# define machine_is_i858()	(machine_arch_type == MACH_TYPE_I858)
-#else
-# define machine_is_i858()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HX2750
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HX2750
-# endif
-# define machine_is_hx2750()	(machine_arch_type == MACH_TYPE_HX2750)
-#else
-# define machine_is_hx2750()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MXC91131EVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MXC91131EVB
-# endif
-# define machine_is_mxc91131evb()	(machine_arch_type == MACH_TYPE_MXC91131EVB)
-#else
-# define machine_is_mxc91131evb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_P700
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_P700
-# endif
-# define machine_is_p700()	(machine_arch_type == MACH_TYPE_P700)
-#else
-# define machine_is_p700()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CPE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CPE
-# endif
-# define machine_is_cpe()	(machine_arch_type == MACH_TYPE_CPE)
-#else
-# define machine_is_cpe()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SPITZ
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SPITZ
-# endif
-# define machine_is_spitz()	(machine_arch_type == MACH_TYPE_SPITZ)
-#else
-# define machine_is_spitz()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NIMBRA340
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NIMBRA340
-# endif
-# define machine_is_nimbra340()	(machine_arch_type == MACH_TYPE_NIMBRA340)
-#else
-# define machine_is_nimbra340()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LPC22XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LPC22XX
-# endif
-# define machine_is_lpc22xx()	(machine_arch_type == MACH_TYPE_LPC22XX)
-#else
-# define machine_is_lpc22xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_COMET3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_COMET3
-# endif
-# define machine_is_omap_comet3()	(machine_arch_type == MACH_TYPE_COMET3)
-#else
-# define machine_is_omap_comet3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_COMET4
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_COMET4
-# endif
-# define machine_is_omap_comet4()	(machine_arch_type == MACH_TYPE_COMET4)
-#else
-# define machine_is_omap_comet4()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CSB625
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CSB625
-# endif
-# define machine_is_csb625()	(machine_arch_type == MACH_TYPE_CSB625)
-#else
-# define machine_is_csb625()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FORTUNET2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FORTUNET2
-# endif
-# define machine_is_fortunet2()	(machine_arch_type == MACH_TYPE_FORTUNET2)
-#else
-# define machine_is_fortunet2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_S5H2200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S5H2200
-# endif
-# define machine_is_s5h2200()	(machine_arch_type == MACH_TYPE_S5H2200)
-#else
-# define machine_is_s5h2200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OPTORM920
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OPTORM920
-# endif
-# define machine_is_optorm920()	(machine_arch_type == MACH_TYPE_OPTORM920)
-#else
-# define machine_is_optorm920()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ADSBITSYXB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADSBITSYXB
-# endif
-# define machine_is_adsbitsyxb()	(machine_arch_type == MACH_TYPE_ADSBITSYXB)
-#else
-# define machine_is_adsbitsyxb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ADSSPHERE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADSSPHERE
-# endif
-# define machine_is_adssphere()	(machine_arch_type == MACH_TYPE_ADSSPHERE)
-#else
-# define machine_is_adssphere()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ADSPORTAL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADSPORTAL
-# endif
-# define machine_is_adsportal()	(machine_arch_type == MACH_TYPE_ADSPORTAL)
-#else
-# define machine_is_adsportal()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LN2410SBC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LN2410SBC
-# endif
-# define machine_is_ln2410sbc()	(machine_arch_type == MACH_TYPE_LN2410SBC)
-#else
-# define machine_is_ln2410sbc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CB3RUFC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CB3RUFC
-# endif
-# define machine_is_cb3rufc()	(machine_arch_type == MACH_TYPE_CB3RUFC)
-#else
-# define machine_is_cb3rufc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MP2USB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MP2USB
-# endif
-# define machine_is_mp2usb()	(machine_arch_type == MACH_TYPE_MP2USB)
-#else
-# define machine_is_mp2usb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NTNP425C
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NTNP425C
-# endif
-# define machine_is_ntnp425c()	(machine_arch_type == MACH_TYPE_NTNP425C)
-#else
-# define machine_is_ntnp425c()	(0)
-#endif
-
-#ifdef CONFIG_MACH_COLIBRI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_COLIBRI
-# endif
-# define machine_is_colibri()	(machine_arch_type == MACH_TYPE_COLIBRI)
-#else
-# define machine_is_colibri()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PCM7220
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PCM7220
-# endif
-# define machine_is_pcm7220()	(machine_arch_type == MACH_TYPE_PCM7220)
-#else
-# define machine_is_pcm7220()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GATEWAY7001
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GATEWAY7001
-# endif
-# define machine_is_gateway7001()	(machine_arch_type == MACH_TYPE_GATEWAY7001)
-#else
-# define machine_is_gateway7001()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PCM027
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PCM027
-# endif
-# define machine_is_pcm027()	(machine_arch_type == MACH_TYPE_PCM027)
-#else
-# define machine_is_pcm027()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CMPXA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CMPXA
-# endif
-# define machine_is_cmpxa()	(machine_arch_type == MACH_TYPE_CMPXA)
-#else
-# define machine_is_cmpxa()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ANUBIS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ANUBIS
-# endif
-# define machine_is_anubis()	(machine_arch_type == MACH_TYPE_ANUBIS)
-#else
-# define machine_is_anubis()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ITE8152
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ITE8152
-# endif
-# define machine_is_ite8152()	(machine_arch_type == MACH_TYPE_ITE8152)
-#else
-# define machine_is_ite8152()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LPC3XXX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LPC3XXX
-# endif
-# define machine_is_lpc3xxx()	(machine_arch_type == MACH_TYPE_LPC3XXX)
-#else
-# define machine_is_lpc3xxx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PUPPETEER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PUPPETEER
-# endif
-# define machine_is_puppeteer()	(machine_arch_type == MACH_TYPE_PUPPETEER)
-#else
-# define machine_is_puppeteer()	(0)
-#endif
-
-#ifdef CONFIG_MACH_E570
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_E570
-# endif
-# define machine_is_e570()	(machine_arch_type == MACH_TYPE_E570)
-#else
-# define machine_is_e570()	(0)
-#endif
-
-#ifdef CONFIG_MACH_X50
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_X50
-# endif
-# define machine_is_x50()	(machine_arch_type == MACH_TYPE_X50)
-#else
-# define machine_is_x50()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RECON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RECON
-# endif
-# define machine_is_recon()	(machine_arch_type == MACH_TYPE_RECON)
-#else
-# define machine_is_recon()	(0)
-#endif
-
-#ifdef CONFIG_MACH_XBOARDGP8
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XBOARDGP8
-# endif
-# define machine_is_xboardgp8()	(machine_arch_type == MACH_TYPE_XBOARDGP8)
-#else
-# define machine_is_xboardgp8()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FPIC2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FPIC2
-# endif
-# define machine_is_fpic2()	(machine_arch_type == MACH_TYPE_FPIC2)
-#else
-# define machine_is_fpic2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AKITA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AKITA
-# endif
-# define machine_is_akita()	(machine_arch_type == MACH_TYPE_AKITA)
-#else
-# define machine_is_akita()	(0)
-#endif
-
-#ifdef CONFIG_MACH_A81
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_A81
-# endif
-# define machine_is_a81()	(machine_arch_type == MACH_TYPE_A81)
-#else
-# define machine_is_a81()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SVM_SC25X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SVM_SC25X
-# endif
-# define machine_is_svm_sc25x()	(machine_arch_type == MACH_TYPE_SVM_SC25X)
-#else
-# define machine_is_svm_sc25x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VADATECH020
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VADATECH020
-# endif
-# define machine_is_vt020()	(machine_arch_type == MACH_TYPE_VADATECH020)
-#else
-# define machine_is_vt020()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TLI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TLI
-# endif
-# define machine_is_tli()	(machine_arch_type == MACH_TYPE_TLI)
-#else
-# define machine_is_tli()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EDB9315LC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EDB9315LC
-# endif
-# define machine_is_edb9315lc()	(machine_arch_type == MACH_TYPE_EDB9315LC)
-#else
-# define machine_is_edb9315lc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PASSEC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PASSEC
-# endif
-# define machine_is_passec()	(machine_arch_type == MACH_TYPE_PASSEC)
-#else
-# define machine_is_passec()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DS_TIGER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DS_TIGER
-# endif
-# define machine_is_ds_tiger()	(machine_arch_type == MACH_TYPE_DS_TIGER)
-#else
-# define machine_is_ds_tiger()	(0)
-#endif
-
-#ifdef CONFIG_MACH_E310
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_E310
-# endif
-# define machine_is_e310()	(machine_arch_type == MACH_TYPE_E310)
-#else
-# define machine_is_e310()	(0)
-#endif
-
-#ifdef CONFIG_MACH_E330
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_E330
-# endif
-# define machine_is_e330()	(machine_arch_type == MACH_TYPE_E330)
-#else
-# define machine_is_e330()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RT3000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RT3000
-# endif
-# define machine_is_rt3000()	(machine_arch_type == MACH_TYPE_RT3000)
-#else
-# define machine_is_rt3000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NOKIA770
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NOKIA770
-# endif
-# define machine_is_nokia770()	(machine_arch_type == MACH_TYPE_NOKIA770)
-#else
-# define machine_is_nokia770()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PNX0106
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PNX0106
-# endif
-# define machine_is_pnx0106()	(machine_arch_type == MACH_TYPE_PNX0106)
-#else
-# define machine_is_pnx0106()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HX21XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HX21XX
-# endif
-# define machine_is_hx21xx()	(machine_arch_type == MACH_TYPE_HX21XX)
-#else
-# define machine_is_hx21xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FARADAY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FARADAY
-# endif
-# define machine_is_faraday()	(machine_arch_type == MACH_TYPE_FARADAY)
-#else
-# define machine_is_faraday()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SBC9312
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SBC9312
-# endif
-# define machine_is_sbc9312()	(machine_arch_type == MACH_TYPE_SBC9312)
-#else
-# define machine_is_sbc9312()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BATMAN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BATMAN
-# endif
-# define machine_is_batman()	(machine_arch_type == MACH_TYPE_BATMAN)
-#else
-# define machine_is_batman()	(0)
-#endif
-
-#ifdef CONFIG_MACH_JPD201
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_JPD201
-# endif
-# define machine_is_jpd201()	(machine_arch_type == MACH_TYPE_JPD201)
-#else
-# define machine_is_jpd201()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MIPSA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MIPSA
-# endif
-# define machine_is_mipsa()	(machine_arch_type == MACH_TYPE_MIPSA)
-#else
-# define machine_is_mipsa()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KACOM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KACOM
-# endif
-# define machine_is_kacom()	(machine_arch_type == MACH_TYPE_KACOM)
-#else
-# define machine_is_kacom()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SWARCOCPU
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SWARCOCPU
-# endif
-# define machine_is_swarcocpu()	(machine_arch_type == MACH_TYPE_SWARCOCPU)
-#else
-# define machine_is_swarcocpu()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SWARCODSL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SWARCODSL
-# endif
-# define machine_is_swarcodsl()	(machine_arch_type == MACH_TYPE_SWARCODSL)
-#else
-# define machine_is_swarcodsl()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BLUEANGEL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BLUEANGEL
-# endif
-# define machine_is_blueangel()	(machine_arch_type == MACH_TYPE_BLUEANGEL)
-#else
-# define machine_is_blueangel()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HAIRYGRAMA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HAIRYGRAMA
-# endif
-# define machine_is_hairygrama()	(machine_arch_type == MACH_TYPE_HAIRYGRAMA)
-#else
-# define machine_is_hairygrama()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BANFF
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BANFF
-# endif
-# define machine_is_banff()	(machine_arch_type == MACH_TYPE_BANFF)
-#else
-# define machine_is_banff()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CARMEVA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CARMEVA
-# endif
-# define machine_is_carmeva()	(machine_arch_type == MACH_TYPE_CARMEVA)
-#else
-# define machine_is_carmeva()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SAM255
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SAM255
-# endif
-# define machine_is_sam255()	(machine_arch_type == MACH_TYPE_SAM255)
-#else
-# define machine_is_sam255()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PPM10
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PPM10
-# endif
-# define machine_is_ppm10()	(machine_arch_type == MACH_TYPE_PPM10)
-#else
-# define machine_is_ppm10()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EDB9315A
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EDB9315A
-# endif
-# define machine_is_edb9315a()	(machine_arch_type == MACH_TYPE_EDB9315A)
-#else
-# define machine_is_edb9315a()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SUNSET
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SUNSET
-# endif
-# define machine_is_sunset()	(machine_arch_type == MACH_TYPE_SUNSET)
-#else
-# define machine_is_sunset()	(0)
-#endif
-
-#ifdef CONFIG_MACH_STARGATE2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STARGATE2
-# endif
-# define machine_is_stargate2()	(machine_arch_type == MACH_TYPE_STARGATE2)
-#else
-# define machine_is_stargate2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_INTELMOTE2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_INTELMOTE2
-# endif
-# define machine_is_intelmote2()	(machine_arch_type == MACH_TYPE_INTELMOTE2)
-#else
-# define machine_is_intelmote2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TRIZEPS4
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TRIZEPS4
-# endif
-# define machine_is_trizeps4()	(machine_arch_type == MACH_TYPE_TRIZEPS4)
-#else
-# define machine_is_trizeps4()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MAINSTONE2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MAINSTONE2
-# endif
-# define machine_is_mainstone2()	(machine_arch_type == MACH_TYPE_MAINSTONE2)
-#else
-# define machine_is_mainstone2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EZ_IXP42X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EZ_IXP42X
-# endif
-# define machine_is_ez_ixp42x()	(machine_arch_type == MACH_TYPE_EZ_IXP42X)
-#else
-# define machine_is_ez_ixp42x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TAPWAVE_ZODIAC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TAPWAVE_ZODIAC
-# endif
-# define machine_is_tapwave_zodiac()	(machine_arch_type == MACH_TYPE_TAPWAVE_ZODIAC)
-#else
-# define machine_is_tapwave_zodiac()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UNIVERSALMETER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UNIVERSALMETER
-# endif
-# define machine_is_universalmeter()	(machine_arch_type == MACH_TYPE_UNIVERSALMETER)
-#else
-# define machine_is_universalmeter()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HICOARM9
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HICOARM9
-# endif
-# define machine_is_hicoarm9()	(machine_arch_type == MACH_TYPE_HICOARM9)
-#else
-# define machine_is_hicoarm9()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PNX4008
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PNX4008
-# endif
-# define machine_is_pnx4008()	(machine_arch_type == MACH_TYPE_PNX4008)
-#else
-# define machine_is_pnx4008()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KWS6000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KWS6000
-# endif
-# define machine_is_kws6000()	(machine_arch_type == MACH_TYPE_KWS6000)
-#else
-# define machine_is_kws6000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PORTUX920T
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PORTUX920T
-# endif
-# define machine_is_portux920t()	(machine_arch_type == MACH_TYPE_PORTUX920T)
-#else
-# define machine_is_portux920t()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EZ_X5
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EZ_X5
-# endif
-# define machine_is_ez_x5()	(machine_arch_type == MACH_TYPE_EZ_X5)
-#else
-# define machine_is_ez_x5()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_RUDOLPH
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_RUDOLPH
-# endif
-# define machine_is_omap_rudolph()	(machine_arch_type == MACH_TYPE_OMAP_RUDOLPH)
-#else
-# define machine_is_omap_rudolph()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CPUAT91
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CPUAT91
-# endif
-# define machine_is_cpuat91()	(machine_arch_type == MACH_TYPE_CPUAT91)
-#else
-# define machine_is_cpuat91()	(0)
-#endif
-
-#ifdef CONFIG_MACH_REA9200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_REA9200
-# endif
-# define machine_is_rea9200()	(machine_arch_type == MACH_TYPE_REA9200)
-#else
-# define machine_is_rea9200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ACTS_PUNE_SA1110
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ACTS_PUNE_SA1110
-# endif
-# define machine_is_acts_pune_sa1110()	(machine_arch_type == MACH_TYPE_ACTS_PUNE_SA1110)
-#else
-# define machine_is_acts_pune_sa1110()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IXP425
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXP425
-# endif
-# define machine_is_ixp425()	(machine_arch_type == MACH_TYPE_IXP425)
-#else
-# define machine_is_ixp425()	(0)
-#endif
-
-#ifdef CONFIG_MACH_I30030ADS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_I30030ADS
-# endif
-# define machine_is_i30030ads()	(machine_arch_type == MACH_TYPE_I30030ADS)
-#else
-# define machine_is_i30030ads()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PERCH
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PERCH
-# endif
-# define machine_is_perch()	(machine_arch_type == MACH_TYPE_PERCH)
-#else
-# define machine_is_perch()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EIS05R1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EIS05R1
-# endif
-# define machine_is_eis05r1()	(machine_arch_type == MACH_TYPE_EIS05R1)
-#else
-# define machine_is_eis05r1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PEPPERPAD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PEPPERPAD
-# endif
-# define machine_is_pepperpad()	(machine_arch_type == MACH_TYPE_PEPPERPAD)
-#else
-# define machine_is_pepperpad()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SB3010
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SB3010
-# endif
-# define machine_is_sb3010()	(machine_arch_type == MACH_TYPE_SB3010)
-#else
-# define machine_is_sb3010()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RM9200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RM9200
-# endif
-# define machine_is_rm9200()	(machine_arch_type == MACH_TYPE_RM9200)
-#else
-# define machine_is_rm9200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DMA03
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DMA03
-# endif
-# define machine_is_dma03()	(machine_arch_type == MACH_TYPE_DMA03)
-#else
-# define machine_is_dma03()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ROAD_S101
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ROAD_S101
-# endif
-# define machine_is_road_s101()	(machine_arch_type == MACH_TYPE_ROAD_S101)
-#else
-# define machine_is_road_s101()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IQ81340SC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IQ81340SC
-# endif
-# define machine_is_iq81340sc()	(machine_arch_type == MACH_TYPE_IQ81340SC)
-#else
-# define machine_is_iq81340sc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IQ_NEXTGEN_B
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IQ_NEXTGEN_B
-# endif
-# define machine_is_iq_nextgen_b()	(machine_arch_type == MACH_TYPE_IQ_NEXTGEN_B)
-#else
-# define machine_is_iq_nextgen_b()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IQ81340MC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IQ81340MC
-# endif
-# define machine_is_iq81340mc()	(machine_arch_type == MACH_TYPE_IQ81340MC)
-#else
-# define machine_is_iq81340mc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IQ_NEXTGEN_D
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IQ_NEXTGEN_D
-# endif
-# define machine_is_iq_nextgen_d()	(machine_arch_type == MACH_TYPE_IQ_NEXTGEN_D)
-#else
-# define machine_is_iq_nextgen_d()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IQ_NEXTGEN_E
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IQ_NEXTGEN_E
-# endif
-# define machine_is_iq_nextgen_e()	(machine_arch_type == MACH_TYPE_IQ_NEXTGEN_E)
-#else
-# define machine_is_iq_nextgen_e()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MALLOW_AT91
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MALLOW_AT91
-# endif
-# define machine_is_mallow_at91()	(machine_arch_type == MACH_TYPE_MALLOW_AT91)
-#else
-# define machine_is_mallow_at91()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CYBERTRACKER_I
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CYBERTRACKER_I
-# endif
-# define machine_is_cybertracker_i()	(machine_arch_type == MACH_TYPE_CYBERTRACKER_I)
-#else
-# define machine_is_cybertracker_i()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GESBC931X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GESBC931X
-# endif
-# define machine_is_gesbc931x()	(machine_arch_type == MACH_TYPE_GESBC931X)
-#else
-# define machine_is_gesbc931x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CENTIPAD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CENTIPAD
-# endif
-# define machine_is_centipad()	(machine_arch_type == MACH_TYPE_CENTIPAD)
-#else
-# define machine_is_centipad()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARMSOC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARMSOC
-# endif
-# define machine_is_armsoc()	(machine_arch_type == MACH_TYPE_ARMSOC)
-#else
-# define machine_is_armsoc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SE4200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SE4200
-# endif
-# define machine_is_se4200()	(machine_arch_type == MACH_TYPE_SE4200)
-#else
-# define machine_is_se4200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EMS197A
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EMS197A
-# endif
-# define machine_is_ems197a()	(machine_arch_type == MACH_TYPE_EMS197A)
-#else
-# define machine_is_ems197a()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MICRO9
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MICRO9
-# endif
-# define machine_is_micro9()	(machine_arch_type == MACH_TYPE_MICRO9)
-#else
-# define machine_is_micro9()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MICRO9L
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MICRO9L
-# endif
-# define machine_is_micro9l()	(machine_arch_type == MACH_TYPE_MICRO9L)
-#else
-# define machine_is_micro9l()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UC5471DSP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UC5471DSP
-# endif
-# define machine_is_uc5471dsp()	(machine_arch_type == MACH_TYPE_UC5471DSP)
-#else
-# define machine_is_uc5471dsp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SJ5471ENG
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SJ5471ENG
-# endif
-# define machine_is_sj5471eng()	(machine_arch_type == MACH_TYPE_SJ5471ENG)
-#else
-# define machine_is_sj5471eng()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CMPXA26X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CMPXA26X
-# endif
-# define machine_is_none()	(machine_arch_type == MACH_TYPE_CMPXA26X)
-#else
-# define machine_is_none()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NC
-# endif
-# define machine_is_nc1()	(machine_arch_type == MACH_TYPE_NC)
-#else
-# define machine_is_nc1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_PALMTE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_PALMTE
-# endif
-# define machine_is_omap_palmte()	(machine_arch_type == MACH_TYPE_OMAP_PALMTE)
-#else
-# define machine_is_omap_palmte()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AJAX52X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AJAX52X
-# endif
-# define machine_is_ajax52x()	(machine_arch_type == MACH_TYPE_AJAX52X)
-#else
-# define machine_is_ajax52x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SIRIUSTAR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SIRIUSTAR
-# endif
-# define machine_is_siriustar()	(machine_arch_type == MACH_TYPE_SIRIUSTAR)
-#else
-# define machine_is_siriustar()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IODATA_HDLG
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IODATA_HDLG
-# endif
-# define machine_is_iodata_hdlg()	(machine_arch_type == MACH_TYPE_IODATA_HDLG)
-#else
-# define machine_is_iodata_hdlg()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91RM9200UTL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91RM9200UTL
-# endif
-# define machine_is_at91rm9200utl()	(machine_arch_type == MACH_TYPE_AT91RM9200UTL)
-#else
-# define machine_is_at91rm9200utl()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BIOSAFE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BIOSAFE
-# endif
-# define machine_is_biosafe()	(machine_arch_type == MACH_TYPE_BIOSAFE)
-#else
-# define machine_is_biosafe()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MP1000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MP1000
-# endif
-# define machine_is_mp1000()	(machine_arch_type == MACH_TYPE_MP1000)
-#else
-# define machine_is_mp1000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PARSY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PARSY
-# endif
-# define machine_is_parsy()	(machine_arch_type == MACH_TYPE_PARSY)
-#else
-# define machine_is_parsy()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CCXP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CCXP
-# endif
-# define machine_is_ccxp270()	(machine_arch_type == MACH_TYPE_CCXP)
-#else
-# define machine_is_ccxp270()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_GSAMPLE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_GSAMPLE
-# endif
-# define machine_is_omap_gsample()	(machine_arch_type == MACH_TYPE_OMAP_GSAMPLE)
-#else
-# define machine_is_omap_gsample()	(0)
-#endif
-
-#ifdef CONFIG_MACH_REALVIEW_EB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_REALVIEW_EB
-# endif
-# define machine_is_realview_eb()	(machine_arch_type == MACH_TYPE_REALVIEW_EB)
-#else
-# define machine_is_realview_eb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SAMOA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SAMOA
-# endif
-# define machine_is_samoa()	(machine_arch_type == MACH_TYPE_SAMOA)
-#else
-# define machine_is_samoa()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PALMT3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PALMT3
-# endif
-# define machine_is_palmt3()	(machine_arch_type == MACH_TYPE_PALMT3)
-#else
-# define machine_is_palmt3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_I878
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_I878
-# endif
-# define machine_is_i878()	(machine_arch_type == MACH_TYPE_I878)
-#else
-# define machine_is_i878()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BORZOI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BORZOI
-# endif
-# define machine_is_borzoi()	(machine_arch_type == MACH_TYPE_BORZOI)
-#else
-# define machine_is_borzoi()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GECKO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GECKO
-# endif
-# define machine_is_gecko()	(machine_arch_type == MACH_TYPE_GECKO)
-#else
-# define machine_is_gecko()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DS101
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DS101
-# endif
-# define machine_is_ds101()	(machine_arch_type == MACH_TYPE_DS101)
-#else
-# define machine_is_ds101()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_PALMTT2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_PALMTT2
-# endif
-# define machine_is_omap_palmtt2()	(machine_arch_type == MACH_TYPE_OMAP_PALMTT2)
-#else
-# define machine_is_omap_palmtt2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PALMLD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PALMLD
-# endif
-# define machine_is_palmld()	(machine_arch_type == MACH_TYPE_PALMLD)
-#else
-# define machine_is_palmld()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CC9C
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CC9C
-# endif
-# define machine_is_cc9c()	(machine_arch_type == MACH_TYPE_CC9C)
-#else
-# define machine_is_cc9c()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SBC1670
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SBC1670
-# endif
-# define machine_is_sbc1670()	(machine_arch_type == MACH_TYPE_SBC1670)
-#else
-# define machine_is_sbc1670()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IXDP28X5
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXDP28X5
-# endif
-# define machine_is_ixdp28x5()	(machine_arch_type == MACH_TYPE_IXDP28X5)
-#else
-# define machine_is_ixdp28x5()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_PALMTT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_PALMTT
-# endif
-# define machine_is_omap_palmtt()	(machine_arch_type == MACH_TYPE_OMAP_PALMTT)
-#else
-# define machine_is_omap_palmtt()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ML696K
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ML696K
-# endif
-# define machine_is_ml696k()	(machine_arch_type == MACH_TYPE_ML696K)
-#else
-# define machine_is_ml696k()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARCOM_ZEUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARCOM_ZEUS
-# endif
-# define machine_is_arcom_zeus()	(machine_arch_type == MACH_TYPE_ARCOM_ZEUS)
-#else
-# define machine_is_arcom_zeus()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OSIRIS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OSIRIS
-# endif
-# define machine_is_osiris()	(machine_arch_type == MACH_TYPE_OSIRIS)
-#else
-# define machine_is_osiris()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MAESTRO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MAESTRO
-# endif
-# define machine_is_maestro()	(machine_arch_type == MACH_TYPE_MAESTRO)
-#else
-# define machine_is_maestro()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PALMTE2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PALMTE2
-# endif
-# define machine_is_palmte2()	(machine_arch_type == MACH_TYPE_PALMTE2)
-#else
-# define machine_is_palmte2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IXBBM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXBBM
-# endif
-# define machine_is_ixbbm()	(machine_arch_type == MACH_TYPE_IXBBM)
-#else
-# define machine_is_ixbbm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX27ADS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX27ADS
-# endif
-# define machine_is_mx27ads()	(machine_arch_type == MACH_TYPE_MX27ADS)
-#else
-# define machine_is_mx27ads()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AX8004
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AX8004
-# endif
-# define machine_is_ax8004()	(machine_arch_type == MACH_TYPE_AX8004)
-#else
-# define machine_is_ax8004()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM9261EK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91SAM9261EK
-# endif
-# define machine_is_at91sam9261ek()	(machine_arch_type == MACH_TYPE_AT91SAM9261EK)
-#else
-# define machine_is_at91sam9261ek()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LOFT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LOFT
-# endif
-# define machine_is_loft()	(machine_arch_type == MACH_TYPE_LOFT)
-#else
-# define machine_is_loft()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MAGPIE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MAGPIE
-# endif
-# define machine_is_magpie()	(machine_arch_type == MACH_TYPE_MAGPIE)
-#else
-# define machine_is_magpie()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX21ADS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX21ADS
-# endif
-# define machine_is_mx21ads()	(machine_arch_type == MACH_TYPE_MX21ADS)
-#else
-# define machine_is_mx21ads()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MB87M3400
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MB87M3400
-# endif
-# define machine_is_mb87m3400()	(machine_arch_type == MACH_TYPE_MB87M3400)
-#else
-# define machine_is_mb87m3400()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MGUARD_DELTA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MGUARD_DELTA
-# endif
-# define machine_is_mguard_delta()	(machine_arch_type == MACH_TYPE_MGUARD_DELTA)
-#else
-# define machine_is_mguard_delta()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_DVDP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DAVINCI_DVDP
-# endif
-# define machine_is_davinci_dvdp()	(machine_arch_type == MACH_TYPE_DAVINCI_DVDP)
-#else
-# define machine_is_davinci_dvdp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCUNIVERSAL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCUNIVERSAL
-# endif
-# define machine_is_htcuniversal()	(machine_arch_type == MACH_TYPE_HTCUNIVERSAL)
-#else
-# define machine_is_htcuniversal()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TPAD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TPAD
-# endif
-# define machine_is_tpad()	(machine_arch_type == MACH_TYPE_TPAD)
-#else
-# define machine_is_tpad()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ROVERP3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ROVERP3
-# endif
-# define machine_is_roverp3()	(machine_arch_type == MACH_TYPE_ROVERP3)
-#else
-# define machine_is_roverp3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_JORNADA928
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_JORNADA928
-# endif
-# define machine_is_jornada928()	(machine_arch_type == MACH_TYPE_JORNADA928)
-#else
-# define machine_is_jornada928()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MV88FXX81
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MV88FXX81
-# endif
-# define machine_is_mv88fxx81()	(machine_arch_type == MACH_TYPE_MV88FXX81)
-#else
-# define machine_is_mv88fxx81()	(0)
-#endif
-
-#ifdef CONFIG_MACH_STMP36XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STMP36XX
-# endif
-# define machine_is_stmp36xx()	(machine_arch_type == MACH_TYPE_STMP36XX)
-#else
-# define machine_is_stmp36xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SXNI79524
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SXNI79524
-# endif
-# define machine_is_sxni79524()	(machine_arch_type == MACH_TYPE_SXNI79524)
-#else
-# define machine_is_sxni79524()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AMS_DELTA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AMS_DELTA
-# endif
-# define machine_is_ams_delta()	(machine_arch_type == MACH_TYPE_AMS_DELTA)
-#else
-# define machine_is_ams_delta()	(0)
-#endif
-
-#ifdef CONFIG_MACH_URANIUM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_URANIUM
-# endif
-# define machine_is_uranium()	(machine_arch_type == MACH_TYPE_URANIUM)
-#else
-# define machine_is_uranium()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UCON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UCON
-# endif
-# define machine_is_ucon()	(machine_arch_type == MACH_TYPE_UCON)
-#else
-# define machine_is_ucon()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NAS100D
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NAS100D
-# endif
-# define machine_is_nas100d()	(machine_arch_type == MACH_TYPE_NAS100D)
-#else
-# define machine_is_nas100d()	(0)
-#endif
-
-#ifdef CONFIG_MACH_L083_1000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_L083_1000
-# endif
-# define machine_is_l083()	(machine_arch_type == MACH_TYPE_L083_1000)
-#else
-# define machine_is_l083()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EZX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EZX
-# endif
-# define machine_is_ezx()	(machine_arch_type == MACH_TYPE_EZX)
-#else
-# define machine_is_ezx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PNX5220
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PNX5220
-# endif
-# define machine_is_pnx5220()	(machine_arch_type == MACH_TYPE_PNX5220)
-#else
-# define machine_is_pnx5220()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BUTTE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BUTTE
-# endif
-# define machine_is_butte()	(machine_arch_type == MACH_TYPE_BUTTE)
-#else
-# define machine_is_butte()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SRM2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SRM2
-# endif
-# define machine_is_srm2()	(machine_arch_type == MACH_TYPE_SRM2)
-#else
-# define machine_is_srm2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DSBR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DSBR
-# endif
-# define machine_is_dsbr()	(machine_arch_type == MACH_TYPE_DSBR)
-#else
-# define machine_is_dsbr()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CRYSTALBALL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CRYSTALBALL
-# endif
-# define machine_is_crystalball()	(machine_arch_type == MACH_TYPE_CRYSTALBALL)
-#else
-# define machine_is_crystalball()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TINYPXA27X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TINYPXA27X
-# endif
-# define machine_is_tinypxa27x()	(machine_arch_type == MACH_TYPE_TINYPXA27X)
-#else
-# define machine_is_tinypxa27x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HERBIE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HERBIE
-# endif
-# define machine_is_herbie()	(machine_arch_type == MACH_TYPE_HERBIE)
-#else
-# define machine_is_herbie()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MAGICIAN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MAGICIAN
-# endif
-# define machine_is_magician()	(machine_arch_type == MACH_TYPE_MAGICIAN)
-#else
-# define machine_is_magician()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CM4002
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CM4002
-# endif
-# define machine_is_cm4002()	(machine_arch_type == MACH_TYPE_CM4002)
-#else
-# define machine_is_cm4002()	(0)
-#endif
-
-#ifdef CONFIG_MACH_B4
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_B4
-# endif
-# define machine_is_b4()	(machine_arch_type == MACH_TYPE_B4)
-#else
-# define machine_is_b4()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MAUI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MAUI
-# endif
-# define machine_is_maui()	(machine_arch_type == MACH_TYPE_MAUI)
-#else
-# define machine_is_maui()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CYBERTRACKER_G
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CYBERTRACKER_G
-# endif
-# define machine_is_cybertracker_g()	(machine_arch_type == MACH_TYPE_CYBERTRACKER_G)
-#else
-# define machine_is_cybertracker_g()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NXDKN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NXDKN
-# endif
-# define machine_is_nxdkn()	(machine_arch_type == MACH_TYPE_NXDKN)
-#else
-# define machine_is_nxdkn()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MIO8390
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MIO8390
-# endif
-# define machine_is_mio8390()	(machine_arch_type == MACH_TYPE_MIO8390)
-#else
-# define machine_is_mio8390()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMI_BOARD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMI_BOARD
-# endif
-# define machine_is_omi_board()	(machine_arch_type == MACH_TYPE_OMI_BOARD)
-#else
-# define machine_is_omi_board()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX21CIV
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX21CIV
-# endif
-# define machine_is_mx21civ()	(machine_arch_type == MACH_TYPE_MX21CIV)
-#else
-# define machine_is_mx21civ()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MAHI_CDAC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MAHI_CDAC
-# endif
-# define machine_is_mahi_cdac()	(machine_arch_type == MACH_TYPE_MAHI_CDAC)
-#else
-# define machine_is_mahi_cdac()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PALMTX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PALMTX
-# endif
-# define machine_is_palmtx()	(machine_arch_type == MACH_TYPE_PALMTX)
-#else
-# define machine_is_palmtx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_S3C2413
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S3C2413
-# endif
-# define machine_is_s3c2413()	(machine_arch_type == MACH_TYPE_S3C2413)
-#else
-# define machine_is_s3c2413()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SAMSYS_EP0
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SAMSYS_EP0
-# endif
-# define machine_is_samsys_ep0()	(machine_arch_type == MACH_TYPE_SAMSYS_EP0)
-#else
-# define machine_is_samsys_ep0()	(0)
-#endif
-
-#ifdef CONFIG_MACH_WG302V1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WG302V1
-# endif
-# define machine_is_wg302v1()	(machine_arch_type == MACH_TYPE_WG302V1)
-#else
-# define machine_is_wg302v1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_WG302V2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WG302V2
-# endif
-# define machine_is_wg302v2()	(machine_arch_type == MACH_TYPE_WG302V2)
-#else
-# define machine_is_wg302v2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EB42X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EB42X
-# endif
-# define machine_is_eb42x()	(machine_arch_type == MACH_TYPE_EB42X)
-#else
-# define machine_is_eb42x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IQ331ES
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IQ331ES
-# endif
-# define machine_is_iq331es()	(machine_arch_type == MACH_TYPE_IQ331ES)
-#else
-# define machine_is_iq331es()	(0)
-#endif
-
-#ifdef CONFIG_MACH_COSYDSP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_COSYDSP
-# endif
-# define machine_is_cosydsp()	(machine_arch_type == MACH_TYPE_COSYDSP)
-#else
-# define machine_is_cosydsp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UPLAT7D
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UPLAT7D
-# endif
-# define machine_is_uplat7d_proto()	(machine_arch_type == MACH_TYPE_UPLAT7D)
-#else
-# define machine_is_uplat7d_proto()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PTDAVINCI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PTDAVINCI
-# endif
-# define machine_is_ptdavinci()	(machine_arch_type == MACH_TYPE_PTDAVINCI)
-#else
-# define machine_is_ptdavinci()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MBUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MBUS
-# endif
-# define machine_is_mbus()	(machine_arch_type == MACH_TYPE_MBUS)
-#else
-# define machine_is_mbus()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NADIA2VB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NADIA2VB
-# endif
-# define machine_is_nadia2vb()	(machine_arch_type == MACH_TYPE_NADIA2VB)
-#else
-# define machine_is_nadia2vb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_R1000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_R1000
-# endif
-# define machine_is_r1000()	(machine_arch_type == MACH_TYPE_R1000)
-#else
-# define machine_is_r1000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HW90250
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HW90250
-# endif
-# define machine_is_hw90250()	(machine_arch_type == MACH_TYPE_HW90250)
-#else
-# define machine_is_hw90250()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_2430SDP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_2430SDP
-# endif
-# define machine_is_omap_2430sdp()	(machine_arch_type == MACH_TYPE_OMAP_2430SDP)
-#else
-# define machine_is_omap_2430sdp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_EVM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DAVINCI_EVM
-# endif
-# define machine_is_davinci_evm()	(machine_arch_type == MACH_TYPE_DAVINCI_EVM)
-#else
-# define machine_is_davinci_evm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_TORNADO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_TORNADO
-# endif
-# define machine_is_omap_tornado()	(machine_arch_type == MACH_TYPE_OMAP_TORNADO)
-#else
-# define machine_is_omap_tornado()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OLOCREEK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OLOCREEK
-# endif
-# define machine_is_olocreek()	(machine_arch_type == MACH_TYPE_OLOCREEK)
-#else
-# define machine_is_olocreek()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PALMZ72
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PALMZ72
-# endif
-# define machine_is_palmz72()	(machine_arch_type == MACH_TYPE_PALMZ72)
-#else
-# define machine_is_palmz72()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NXDB500
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NXDB500
-# endif
-# define machine_is_nxdb500()	(machine_arch_type == MACH_TYPE_NXDB500)
-#else
-# define machine_is_nxdb500()	(0)
-#endif
-
-#ifdef CONFIG_MACH_APF9328
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_APF9328
-# endif
-# define machine_is_apf9328()	(machine_arch_type == MACH_TYPE_APF9328)
-#else
-# define machine_is_apf9328()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_WIPOQ
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_WIPOQ
-# endif
-# define machine_is_omap_wipoq()	(machine_arch_type == MACH_TYPE_OMAP_WIPOQ)
-#else
-# define machine_is_omap_wipoq()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_TWIP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_TWIP
-# endif
-# define machine_is_omap_twip()	(machine_arch_type == MACH_TYPE_OMAP_TWIP)
-#else
-# define machine_is_omap_twip()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TREO650
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TREO650
-# endif
-# define machine_is_treo650()	(machine_arch_type == MACH_TYPE_TREO650)
-#else
-# define machine_is_treo650()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ACUMEN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ACUMEN
-# endif
-# define machine_is_acumen()	(machine_arch_type == MACH_TYPE_ACUMEN)
-#else
-# define machine_is_acumen()	(0)
-#endif
-
-#ifdef CONFIG_MACH_XP100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XP100
-# endif
-# define machine_is_xp100()	(machine_arch_type == MACH_TYPE_XP100)
-#else
-# define machine_is_xp100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FS2410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FS2410
-# endif
-# define machine_is_fs2410()	(machine_arch_type == MACH_TYPE_FS2410)
-#else
-# define machine_is_fs2410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PXA270_CERF
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXA270_CERF
-# endif
-# define machine_is_pxa270_cerf()	(machine_arch_type == MACH_TYPE_PXA270_CERF)
-#else
-# define machine_is_pxa270_cerf()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SQ2FTLPALM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SQ2FTLPALM
-# endif
-# define machine_is_sq2ftlpalm()	(machine_arch_type == MACH_TYPE_SQ2FTLPALM)
-#else
-# define machine_is_sq2ftlpalm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BSEMSERVER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BSEMSERVER
-# endif
-# define machine_is_bsemserver()	(machine_arch_type == MACH_TYPE_BSEMSERVER)
-#else
-# define machine_is_bsemserver()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NETCLIENT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NETCLIENT
-# endif
-# define machine_is_netclient()	(machine_arch_type == MACH_TYPE_NETCLIENT)
-#else
-# define machine_is_netclient()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PALMT5
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PALMT5
-# endif
-# define machine_is_palmt5()	(machine_arch_type == MACH_TYPE_PALMT5)
-#else
-# define machine_is_palmt5()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PALMTC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PALMTC
-# endif
-# define machine_is_palmtc()	(machine_arch_type == MACH_TYPE_PALMTC)
-#else
-# define machine_is_palmtc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_APOLLON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_APOLLON
-# endif
-# define machine_is_omap_apollon()	(machine_arch_type == MACH_TYPE_OMAP_APOLLON)
-#else
-# define machine_is_omap_apollon()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MXC30030EVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MXC30030EVB
-# endif
-# define machine_is_mxc30030evb()	(machine_arch_type == MACH_TYPE_MXC30030EVB)
-#else
-# define machine_is_mxc30030evb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_REA_2D
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_REA_2D
-# endif
-# define machine_is_rea_2d()	(machine_arch_type == MACH_TYPE_REA_2D)
-#else
-# define machine_is_rea_2d()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TI3E524
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TI3E524
-# endif
-# define machine_is_eti3e524()	(machine_arch_type == MACH_TYPE_TI3E524)
-#else
-# define machine_is_eti3e524()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ATEB9200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ATEB9200
-# endif
-# define machine_is_ateb9200()	(machine_arch_type == MACH_TYPE_ATEB9200)
-#else
-# define machine_is_ateb9200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AUCKLAND
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AUCKLAND
-# endif
-# define machine_is_auckland()	(machine_arch_type == MACH_TYPE_AUCKLAND)
-#else
-# define machine_is_auckland()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AK3320M
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AK3320M
-# endif
-# define machine_is_ak3220m()	(machine_arch_type == MACH_TYPE_AK3320M)
-#else
-# define machine_is_ak3220m()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DURAMAX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DURAMAX
-# endif
-# define machine_is_duramax()	(machine_arch_type == MACH_TYPE_DURAMAX)
-#else
-# define machine_is_duramax()	(0)
-#endif
-
-#ifdef CONFIG_MACH_N35
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_N35
-# endif
-# define machine_is_n35()	(machine_arch_type == MACH_TYPE_N35)
-#else
-# define machine_is_n35()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PRONGHORN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PRONGHORN
-# endif
-# define machine_is_pronghorn()	(machine_arch_type == MACH_TYPE_PRONGHORN)
-#else
-# define machine_is_pronghorn()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FUNDY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FUNDY
-# endif
-# define machine_is_fundy()	(machine_arch_type == MACH_TYPE_FUNDY)
-#else
-# define machine_is_fundy()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LOGICPD_PXA270
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LOGICPD_PXA270
-# endif
-# define machine_is_logicpd_pxa270()	(machine_arch_type == MACH_TYPE_LOGICPD_PXA270)
-#else
-# define machine_is_logicpd_pxa270()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CPU777
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CPU777
-# endif
-# define machine_is_cpu777()	(machine_arch_type == MACH_TYPE_CPU777)
-#else
-# define machine_is_cpu777()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SIMICON9201
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SIMICON9201
-# endif
-# define machine_is_simicon9201()	(machine_arch_type == MACH_TYPE_SIMICON9201)
-#else
-# define machine_is_simicon9201()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LEAP2_HPM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LEAP2_HPM
-# endif
-# define machine_is_leap2_hpm()	(machine_arch_type == MACH_TYPE_LEAP2_HPM)
-#else
-# define machine_is_leap2_hpm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CM922TXA10
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CM922TXA10
-# endif
-# define machine_is_cm922txa10()	(machine_arch_type == MACH_TYPE_CM922TXA10)
-#else
-# define machine_is_cm922txa10()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PXA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXA
-# endif
-# define machine_is_sandgate()	(machine_arch_type == MACH_TYPE_PXA)
-#else
-# define machine_is_sandgate()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SANDGATE2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SANDGATE2
-# endif
-# define machine_is_sandgate2()	(machine_arch_type == MACH_TYPE_SANDGATE2)
-#else
-# define machine_is_sandgate2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SANDGATE2G
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SANDGATE2G
-# endif
-# define machine_is_sandgate2g()	(machine_arch_type == MACH_TYPE_SANDGATE2G)
-#else
-# define machine_is_sandgate2g()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SANDGATE2P
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SANDGATE2P
-# endif
-# define machine_is_sandgate2p()	(machine_arch_type == MACH_TYPE_SANDGATE2P)
-#else
-# define machine_is_sandgate2p()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FRED_JACK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FRED_JACK
-# endif
-# define machine_is_fred_jack()	(machine_arch_type == MACH_TYPE_FRED_JACK)
-#else
-# define machine_is_fred_jack()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TTG_COLOR1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TTG_COLOR1
-# endif
-# define machine_is_ttg_color1()	(machine_arch_type == MACH_TYPE_TTG_COLOR1)
-#else
-# define machine_is_ttg_color1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NXEB500HMI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NXEB500HMI
-# endif
-# define machine_is_nxeb500hmi()	(machine_arch_type == MACH_TYPE_NXEB500HMI)
-#else
-# define machine_is_nxeb500hmi()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NETDCU8
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NETDCU8
-# endif
-# define machine_is_netdcu8()	(machine_arch_type == MACH_TYPE_NETDCU8)
-#else
-# define machine_is_netdcu8()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NG_FVX538
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NG_FVX538
-# endif
-# define machine_is_ng_fvx538()	(machine_arch_type == MACH_TYPE_NG_FVX538)
-#else
-# define machine_is_ng_fvx538()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NG_FVS338
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NG_FVS338
-# endif
-# define machine_is_ng_fvs338()	(machine_arch_type == MACH_TYPE_NG_FVS338)
-#else
-# define machine_is_ng_fvs338()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PNX4103
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PNX4103
-# endif
-# define machine_is_pnx4103()	(machine_arch_type == MACH_TYPE_PNX4103)
-#else
-# define machine_is_pnx4103()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HESDB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HESDB
-# endif
-# define machine_is_hesdb()	(machine_arch_type == MACH_TYPE_HESDB)
-#else
-# define machine_is_hesdb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_XSILO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XSILO
-# endif
-# define machine_is_xsilo()	(machine_arch_type == MACH_TYPE_XSILO)
-#else
-# define machine_is_xsilo()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ESPRESSO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ESPRESSO
-# endif
-# define machine_is_espresso()	(machine_arch_type == MACH_TYPE_ESPRESSO)
-#else
-# define machine_is_espresso()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EMLC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EMLC
-# endif
-# define machine_is_emlc()	(machine_arch_type == MACH_TYPE_EMLC)
-#else
-# define machine_is_emlc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SISTERON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SISTERON
-# endif
-# define machine_is_sisteron()	(machine_arch_type == MACH_TYPE_SISTERON)
-#else
-# define machine_is_sisteron()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RX1950
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RX1950
-# endif
-# define machine_is_rx1950()	(machine_arch_type == MACH_TYPE_RX1950)
-#else
-# define machine_is_rx1950()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TSC_VENUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TSC_VENUS
-# endif
-# define machine_is_tsc_venus()	(machine_arch_type == MACH_TYPE_TSC_VENUS)
-#else
-# define machine_is_tsc_venus()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DS101J
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DS101J
-# endif
-# define machine_is_ds101j()	(machine_arch_type == MACH_TYPE_DS101J)
-#else
-# define machine_is_ds101j()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MXC30030ADS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MXC30030ADS
-# endif
-# define machine_is_mxc30030ads()	(machine_arch_type == MACH_TYPE_MXC30030ADS)
-#else
-# define machine_is_mxc30030ads()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FUJITSU_WIMAXSOC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FUJITSU_WIMAXSOC
-# endif
-# define machine_is_fujitsu_wimaxsoc()	(machine_arch_type == MACH_TYPE_FUJITSU_WIMAXSOC)
-#else
-# define machine_is_fujitsu_wimaxsoc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DUALPCMODEM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DUALPCMODEM
-# endif
-# define machine_is_dualpcmodem()	(machine_arch_type == MACH_TYPE_DUALPCMODEM)
-#else
-# define machine_is_dualpcmodem()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GESBC9312
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GESBC9312
-# endif
-# define machine_is_gesbc9312()	(machine_arch_type == MACH_TYPE_GESBC9312)
-#else
-# define machine_is_gesbc9312()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCAPACHE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCAPACHE
-# endif
-# define machine_is_htcapache()	(machine_arch_type == MACH_TYPE_HTCAPACHE)
-#else
-# define machine_is_htcapache()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IXDP435
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXDP435
-# endif
-# define machine_is_ixdp435()	(machine_arch_type == MACH_TYPE_IXDP435)
-#else
-# define machine_is_ixdp435()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CATPROVT100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CATPROVT100
-# endif
-# define machine_is_catprovt100()	(machine_arch_type == MACH_TYPE_CATPROVT100)
-#else
-# define machine_is_catprovt100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PICOTUX1XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PICOTUX1XX
-# endif
-# define machine_is_picotux1xx()	(machine_arch_type == MACH_TYPE_PICOTUX1XX)
-#else
-# define machine_is_picotux1xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PICOTUX2XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PICOTUX2XX
-# endif
-# define machine_is_picotux2xx()	(machine_arch_type == MACH_TYPE_PICOTUX2XX)
-#else
-# define machine_is_picotux2xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DSMG600
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DSMG600
-# endif
-# define machine_is_dsmg600()	(machine_arch_type == MACH_TYPE_DSMG600)
-#else
-# define machine_is_dsmg600()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EMPC2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EMPC2
-# endif
-# define machine_is_empc2()	(machine_arch_type == MACH_TYPE_EMPC2)
-#else
-# define machine_is_empc2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VENTURA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VENTURA
-# endif
-# define machine_is_ventura()	(machine_arch_type == MACH_TYPE_VENTURA)
-#else
-# define machine_is_ventura()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PHIDGET_SBC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PHIDGET_SBC
-# endif
-# define machine_is_phidget_sbc()	(machine_arch_type == MACH_TYPE_PHIDGET_SBC)
-#else
-# define machine_is_phidget_sbc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IJ3K
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IJ3K
-# endif
-# define machine_is_ij3k()	(machine_arch_type == MACH_TYPE_IJ3K)
-#else
-# define machine_is_ij3k()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PISGAH
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PISGAH
-# endif
-# define machine_is_pisgah()	(machine_arch_type == MACH_TYPE_PISGAH)
-#else
-# define machine_is_pisgah()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_FSAMPLE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_FSAMPLE
-# endif
-# define machine_is_omap_fsample()	(machine_arch_type == MACH_TYPE_OMAP_FSAMPLE)
-#else
-# define machine_is_omap_fsample()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SG720
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SG720
-# endif
-# define machine_is_sg720()	(machine_arch_type == MACH_TYPE_SG720)
-#else
-# define machine_is_sg720()	(0)
-#endif
-
-#ifdef CONFIG_MACH_REDFOX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_REDFOX
-# endif
-# define machine_is_redfox()	(machine_arch_type == MACH_TYPE_REDFOX)
-#else
-# define machine_is_redfox()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MYSH_EP9315_1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MYSH_EP9315_1
-# endif
-# define machine_is_mysh_ep9315_1()	(machine_arch_type == MACH_TYPE_MYSH_EP9315_1)
-#else
-# define machine_is_mysh_ep9315_1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TPF106
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TPF106
-# endif
-# define machine_is_tpf106()	(machine_arch_type == MACH_TYPE_TPF106)
-#else
-# define machine_is_tpf106()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91RM9200KG
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91RM9200KG
-# endif
-# define machine_is_at91rm9200kg()	(machine_arch_type == MACH_TYPE_AT91RM9200KG)
-#else
-# define machine_is_at91rm9200kg()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SLEDB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SLEDB
-# endif
-# define machine_is_rcmt2()	(machine_arch_type == MACH_TYPE_SLEDB)
-#else
-# define machine_is_rcmt2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ONTRACK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ONTRACK
-# endif
-# define machine_is_ontrack()	(machine_arch_type == MACH_TYPE_ONTRACK)
-#else
-# define machine_is_ontrack()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PM1200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PM1200
-# endif
-# define machine_is_pm1200()	(machine_arch_type == MACH_TYPE_PM1200)
-#else
-# define machine_is_pm1200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ESS24XXX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ESS24XXX
-# endif
-# define machine_is_ess24562()	(machine_arch_type == MACH_TYPE_ESS24XXX)
-#else
-# define machine_is_ess24562()	(0)
-#endif
-
-#ifdef CONFIG_MACH_COREMP7
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_COREMP7
-# endif
-# define machine_is_coremp7()	(machine_arch_type == MACH_TYPE_COREMP7)
-#else
-# define machine_is_coremp7()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NEXCODER_6446
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NEXCODER_6446
-# endif
-# define machine_is_nexcoder_6446()	(machine_arch_type == MACH_TYPE_NEXCODER_6446)
-#else
-# define machine_is_nexcoder_6446()	(0)
-#endif
-
-#ifdef CONFIG_MACH_STVC8380
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STVC8380
-# endif
-# define machine_is_stvc8380()	(machine_arch_type == MACH_TYPE_STVC8380)
-#else
-# define machine_is_stvc8380()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TEKLYNX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TEKLYNX
-# endif
-# define machine_is_teklynx()	(machine_arch_type == MACH_TYPE_TEKLYNX)
-#else
-# define machine_is_teklynx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CARBONADO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CARBONADO
-# endif
-# define machine_is_carbonado()	(machine_arch_type == MACH_TYPE_CARBONADO)
-#else
-# define machine_is_carbonado()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SYSMOS_MP730
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SYSMOS_MP730
-# endif
-# define machine_is_sysmos_mp730()	(machine_arch_type == MACH_TYPE_SYSMOS_MP730)
-#else
-# define machine_is_sysmos_mp730()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SNAPPER_CL15
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SNAPPER_CL15
-# endif
-# define machine_is_snapper_cl15()	(machine_arch_type == MACH_TYPE_SNAPPER_CL15)
-#else
-# define machine_is_snapper_cl15()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PGIGIM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PGIGIM
-# endif
-# define machine_is_pgigim()	(machine_arch_type == MACH_TYPE_PGIGIM)
-#else
-# define machine_is_pgigim()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PTX9160P2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PTX9160P2
-# endif
-# define machine_is_ptx9160p2()	(machine_arch_type == MACH_TYPE_PTX9160P2)
-#else
-# define machine_is_ptx9160p2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DCORE1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DCORE1
-# endif
-# define machine_is_dcore1()	(machine_arch_type == MACH_TYPE_DCORE1)
-#else
-# define machine_is_dcore1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VICTORPXA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VICTORPXA
-# endif
-# define machine_is_victorpxa()	(machine_arch_type == MACH_TYPE_VICTORPXA)
-#else
-# define machine_is_victorpxa()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX2DTB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX2DTB
-# endif
-# define machine_is_mx2dtb()	(machine_arch_type == MACH_TYPE_MX2DTB)
-#else
-# define machine_is_mx2dtb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PXA_IREX_ER0100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXA_IREX_ER0100
-# endif
-# define machine_is_pxa_irex_er0100()	(machine_arch_type == MACH_TYPE_PXA_IREX_ER0100)
-#else
-# define machine_is_pxa_irex_er0100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_PALMZ71
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_PALMZ71
-# endif
-# define machine_is_omap_palmz71()	(machine_arch_type == MACH_TYPE_OMAP_PALMZ71)
-#else
-# define machine_is_omap_palmz71()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BARTEC_DEG
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BARTEC_DEG
-# endif
-# define machine_is_bartec_deg()	(machine_arch_type == MACH_TYPE_BARTEC_DEG)
-#else
-# define machine_is_bartec_deg()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HW50251
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HW50251
-# endif
-# define machine_is_hw50251()	(machine_arch_type == MACH_TYPE_HW50251)
-#else
-# define machine_is_hw50251()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IBOX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IBOX
-# endif
-# define machine_is_ibox()	(machine_arch_type == MACH_TYPE_IBOX)
-#else
-# define machine_is_ibox()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ATLASLH7A404
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ATLASLH7A404
-# endif
-# define machine_is_atlaslh7a404()	(machine_arch_type == MACH_TYPE_ATLASLH7A404)
-#else
-# define machine_is_atlaslh7a404()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PT2026
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PT2026
-# endif
-# define machine_is_pt2026()	(machine_arch_type == MACH_TYPE_PT2026)
-#else
-# define machine_is_pt2026()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCALPINE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCALPINE
-# endif
-# define machine_is_htcalpine()	(machine_arch_type == MACH_TYPE_HTCALPINE)
-#else
-# define machine_is_htcalpine()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BARTEC_VTU
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BARTEC_VTU
-# endif
-# define machine_is_bartec_vtu()	(machine_arch_type == MACH_TYPE_BARTEC_VTU)
-#else
-# define machine_is_bartec_vtu()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VCOREII
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VCOREII
-# endif
-# define machine_is_vcoreii()	(machine_arch_type == MACH_TYPE_VCOREII)
-#else
-# define machine_is_vcoreii()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PDNB3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PDNB3
-# endif
-# define machine_is_pdnb3()	(machine_arch_type == MACH_TYPE_PDNB3)
-#else
-# define machine_is_pdnb3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCBEETLES
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCBEETLES
-# endif
-# define machine_is_htcbeetles()	(machine_arch_type == MACH_TYPE_HTCBEETLES)
-#else
-# define machine_is_htcbeetles()	(0)
-#endif
-
-#ifdef CONFIG_MACH_S3C6400
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S3C6400
-# endif
-# define machine_is_s3c6400()	(machine_arch_type == MACH_TYPE_S3C6400)
-#else
-# define machine_is_s3c6400()	(0)
-#endif
-
-#ifdef CONFIG_MACH_S3C2443
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S3C2443
-# endif
-# define machine_is_s3c2443()	(machine_arch_type == MACH_TYPE_S3C2443)
-#else
-# define machine_is_s3c2443()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_LDK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_LDK
-# endif
-# define machine_is_omap_ldk()	(machine_arch_type == MACH_TYPE_OMAP_LDK)
-#else
-# define machine_is_omap_ldk()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK2460
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMDK2460
-# endif
-# define machine_is_smdk2460()	(machine_arch_type == MACH_TYPE_SMDK2460)
-#else
-# define machine_is_smdk2460()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK2440
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMDK2440
-# endif
-# define machine_is_smdk2440()	(machine_arch_type == MACH_TYPE_SMDK2440)
-#else
-# define machine_is_smdk2440()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK2412
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMDK2412
-# endif
-# define machine_is_smdk2412()	(machine_arch_type == MACH_TYPE_SMDK2412)
-#else
-# define machine_is_smdk2412()	(0)
-#endif
-
-#ifdef CONFIG_MACH_WEBBOX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WEBBOX
-# endif
-# define machine_is_webbox()	(machine_arch_type == MACH_TYPE_WEBBOX)
-#else
-# define machine_is_webbox()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CWWNDP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CWWNDP
-# endif
-# define machine_is_cwwndp()	(machine_arch_type == MACH_TYPE_CWWNDP)
-#else
-# define machine_is_cwwndp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DRAGON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DRAGON
-# endif
-# define machine_is_i839()	(machine_arch_type == MACH_TYPE_DRAGON)
-#else
-# define machine_is_i839()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OPENDO_CPU_BOARD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OPENDO_CPU_BOARD
-# endif
-# define machine_is_opendo_cpu_board()	(machine_arch_type == MACH_TYPE_OPENDO_CPU_BOARD)
-#else
-# define machine_is_opendo_cpu_board()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CCM2200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CCM2200
-# endif
-# define machine_is_ccm2200()	(machine_arch_type == MACH_TYPE_CCM2200)
-#else
-# define machine_is_ccm2200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ETWARM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ETWARM
-# endif
-# define machine_is_etwarm()	(machine_arch_type == MACH_TYPE_ETWARM)
-#else
-# define machine_is_etwarm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_M93030
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_M93030
-# endif
-# define machine_is_m93030()	(machine_arch_type == MACH_TYPE_M93030)
-#else
-# define machine_is_m93030()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CC7U
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CC7U
-# endif
-# define machine_is_cc7u()	(machine_arch_type == MACH_TYPE_CC7U)
-#else
-# define machine_is_cc7u()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MTT_RANGER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MTT_RANGER
-# endif
-# define machine_is_mtt_ranger()	(machine_arch_type == MACH_TYPE_MTT_RANGER)
-#else
-# define machine_is_mtt_ranger()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NEXUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NEXUS
-# endif
-# define machine_is_nexus()	(machine_arch_type == MACH_TYPE_NEXUS)
-#else
-# define machine_is_nexus()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DESMAN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DESMAN
-# endif
-# define machine_is_desman()	(machine_arch_type == MACH_TYPE_DESMAN)
-#else
-# define machine_is_desman()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BKDE303
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BKDE303
-# endif
-# define machine_is_bkde303()	(machine_arch_type == MACH_TYPE_BKDE303)
-#else
-# define machine_is_bkde303()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK2413
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMDK2413
-# endif
-# define machine_is_smdk2413()	(machine_arch_type == MACH_TYPE_SMDK2413)
-#else
-# define machine_is_smdk2413()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AML_M7200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AML_M7200
-# endif
-# define machine_is_aml_m7200()	(machine_arch_type == MACH_TYPE_AML_M7200)
-#else
-# define machine_is_aml_m7200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AML_M5900
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AML_M5900
-# endif
-# define machine_is_aml_m5900()	(machine_arch_type == MACH_TYPE_AML_M5900)
-#else
-# define machine_is_aml_m5900()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SG640
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SG640
-# endif
-# define machine_is_sg640()	(machine_arch_type == MACH_TYPE_SG640)
-#else
-# define machine_is_sg640()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EDG79524
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EDG79524
-# endif
-# define machine_is_edg79524()	(machine_arch_type == MACH_TYPE_EDG79524)
-#else
-# define machine_is_edg79524()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AI2410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AI2410
-# endif
-# define machine_is_ai2410()	(machine_arch_type == MACH_TYPE_AI2410)
-#else
-# define machine_is_ai2410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IXP465
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IXP465
-# endif
-# define machine_is_ixp465()	(machine_arch_type == MACH_TYPE_IXP465)
-#else
-# define machine_is_ixp465()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BALLOON3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BALLOON3
-# endif
-# define machine_is_balloon3()	(machine_arch_type == MACH_TYPE_BALLOON3)
-#else
-# define machine_is_balloon3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HEINS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HEINS
-# endif
-# define machine_is_heins()	(machine_arch_type == MACH_TYPE_HEINS)
-#else
-# define machine_is_heins()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MPLUSEVA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MPLUSEVA
-# endif
-# define machine_is_mpluseva()	(machine_arch_type == MACH_TYPE_MPLUSEVA)
-#else
-# define machine_is_mpluseva()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RT042
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RT042
-# endif
-# define machine_is_rt042()	(machine_arch_type == MACH_TYPE_RT042)
-#else
-# define machine_is_rt042()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CWIEM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CWIEM
-# endif
-# define machine_is_cwiem()	(machine_arch_type == MACH_TYPE_CWIEM)
-#else
-# define machine_is_cwiem()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CM_X270
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CM_X270
-# endif
-# define machine_is_cm_x270()	(machine_arch_type == MACH_TYPE_CM_X270)
-#else
-# define machine_is_cm_x270()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CM_X255
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CM_X255
-# endif
-# define machine_is_cm_x255()	(machine_arch_type == MACH_TYPE_CM_X255)
-#else
-# define machine_is_cm_x255()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ESH_AT91
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ESH_AT91
-# endif
-# define machine_is_esh_at91()	(machine_arch_type == MACH_TYPE_ESH_AT91)
-#else
-# define machine_is_esh_at91()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SANDGATE3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SANDGATE3
-# endif
-# define machine_is_sandgate3()	(machine_arch_type == MACH_TYPE_SANDGATE3)
-#else
-# define machine_is_sandgate3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PRIMO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PRIMO
-# endif
-# define machine_is_primo()	(machine_arch_type == MACH_TYPE_PRIMO)
-#else
-# define machine_is_primo()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GEMSTONE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GEMSTONE
-# endif
-# define machine_is_gemstone()	(machine_arch_type == MACH_TYPE_GEMSTONE)
-#else
-# define machine_is_gemstone()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PRONGHORNMETRO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PRONGHORNMETRO
-# endif
-# define machine_is_pronghorn_metro()	(machine_arch_type == MACH_TYPE_PRONGHORNMETRO)
-#else
-# define machine_is_pronghorn_metro()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SIDEWINDER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SIDEWINDER
-# endif
-# define machine_is_sidewinder()	(machine_arch_type == MACH_TYPE_SIDEWINDER)
-#else
-# define machine_is_sidewinder()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PICOMOD1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PICOMOD1
-# endif
-# define machine_is_picomod1()	(machine_arch_type == MACH_TYPE_PICOMOD1)
-#else
-# define machine_is_picomod1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SG590
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SG590
-# endif
-# define machine_is_sg590()	(machine_arch_type == MACH_TYPE_SG590)
-#else
-# define machine_is_sg590()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AKAI9307
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AKAI9307
-# endif
-# define machine_is_akai9307()	(machine_arch_type == MACH_TYPE_AKAI9307)
-#else
-# define machine_is_akai9307()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FONTAINE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FONTAINE
-# endif
-# define machine_is_fontaine()	(machine_arch_type == MACH_TYPE_FONTAINE)
-#else
-# define machine_is_fontaine()	(0)
-#endif
-
-#ifdef CONFIG_MACH_WOMBAT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WOMBAT
-# endif
-# define machine_is_wombat()	(machine_arch_type == MACH_TYPE_WOMBAT)
-#else
-# define machine_is_wombat()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ACQ300
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ACQ300
-# endif
-# define machine_is_acq300()	(machine_arch_type == MACH_TYPE_ACQ300)
-#else
-# define machine_is_acq300()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MOD_270
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MOD_270
-# endif
-# define machine_is_mod272()	(machine_arch_type == MACH_TYPE_MOD_270)
-#else
-# define machine_is_mod272()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VC0820
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VC0820
-# endif
-# define machine_is_vmc_vc0820()	(machine_arch_type == MACH_TYPE_VC0820)
-#else
-# define machine_is_vmc_vc0820()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ANI_AIM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ANI_AIM
-# endif
-# define machine_is_ani_aim()	(machine_arch_type == MACH_TYPE_ANI_AIM)
-#else
-# define machine_is_ani_aim()	(0)
-#endif
-
-#ifdef CONFIG_MACH_JELLYFISH
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_JELLYFISH
-# endif
-# define machine_is_jellyfish()	(machine_arch_type == MACH_TYPE_JELLYFISH)
-#else
-# define machine_is_jellyfish()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AMANITA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AMANITA
-# endif
-# define machine_is_amanita()	(machine_arch_type == MACH_TYPE_AMANITA)
-#else
-# define machine_is_amanita()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VLINK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VLINK
-# endif
-# define machine_is_vlink()	(machine_arch_type == MACH_TYPE_VLINK)
-#else
-# define machine_is_vlink()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DEXFLEX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DEXFLEX
-# endif
-# define machine_is_dexflex()	(machine_arch_type == MACH_TYPE_DEXFLEX)
-#else
-# define machine_is_dexflex()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EIGEN_TTQ
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EIGEN_TTQ
-# endif
-# define machine_is_eigen_ttq()	(machine_arch_type == MACH_TYPE_EIGEN_TTQ)
-#else
-# define machine_is_eigen_ttq()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARCOM_TITAN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARCOM_TITAN
-# endif
-# define machine_is_arcom_titan()	(machine_arch_type == MACH_TYPE_ARCOM_TITAN)
-#else
-# define machine_is_arcom_titan()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TABLA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TABLA
-# endif
-# define machine_is_tabla()	(machine_arch_type == MACH_TYPE_TABLA)
-#else
-# define machine_is_tabla()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MDIRAC3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MDIRAC3
-# endif
-# define machine_is_mdirac3()	(machine_arch_type == MACH_TYPE_MDIRAC3)
-#else
-# define machine_is_mdirac3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MRHFBP2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MRHFBP2
-# endif
-# define machine_is_mrhfbp2()	(machine_arch_type == MACH_TYPE_MRHFBP2)
-#else
-# define machine_is_mrhfbp2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91RM9200RB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91RM9200RB
-# endif
-# define machine_is_at91rm9200rb()	(machine_arch_type == MACH_TYPE_AT91RM9200RB)
-#else
-# define machine_is_at91rm9200rb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ANI_APM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ANI_APM
-# endif
-# define machine_is_ani_apm()	(machine_arch_type == MACH_TYPE_ANI_APM)
-#else
-# define machine_is_ani_apm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ELLA1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ELLA1
-# endif
-# define machine_is_ella1()	(machine_arch_type == MACH_TYPE_ELLA1)
-#else
-# define machine_is_ella1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_INHAND_PXA27X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_INHAND_PXA27X
-# endif
-# define machine_is_inhand_pxa27x()	(machine_arch_type == MACH_TYPE_INHAND_PXA27X)
-#else
-# define machine_is_inhand_pxa27x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_INHAND_PXA25X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_INHAND_PXA25X
-# endif
-# define machine_is_inhand_pxa25x()	(machine_arch_type == MACH_TYPE_INHAND_PXA25X)
-#else
-# define machine_is_inhand_pxa25x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EMPOS_XM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EMPOS_XM
-# endif
-# define machine_is_empos_xm()	(machine_arch_type == MACH_TYPE_EMPOS_XM)
-#else
-# define machine_is_empos_xm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EMPOS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EMPOS
-# endif
-# define machine_is_empos()	(machine_arch_type == MACH_TYPE_EMPOS)
-#else
-# define machine_is_empos()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EMPOS_TINY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EMPOS_TINY
-# endif
-# define machine_is_empos_tiny()	(machine_arch_type == MACH_TYPE_EMPOS_TINY)
-#else
-# define machine_is_empos_tiny()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EMPOS_SM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EMPOS_SM
-# endif
-# define machine_is_empos_sm()	(machine_arch_type == MACH_TYPE_EMPOS_SM)
-#else
-# define machine_is_empos_sm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EGRET
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EGRET
-# endif
-# define machine_is_egret()	(machine_arch_type == MACH_TYPE_EGRET)
-#else
-# define machine_is_egret()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OSTRICH
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OSTRICH
-# endif
-# define machine_is_ostrich()	(machine_arch_type == MACH_TYPE_OSTRICH)
-#else
-# define machine_is_ostrich()	(0)
-#endif
-
-#ifdef CONFIG_MACH_N50
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_N50
-# endif
-# define machine_is_n50()	(machine_arch_type == MACH_TYPE_N50)
-#else
-# define machine_is_n50()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ECBAT91
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ECBAT91
-# endif
-# define machine_is_ecbat91()	(machine_arch_type == MACH_TYPE_ECBAT91)
-#else
-# define machine_is_ecbat91()	(0)
-#endif
-
-#ifdef CONFIG_MACH_STAREAST
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STAREAST
-# endif
-# define machine_is_stareast()	(machine_arch_type == MACH_TYPE_STAREAST)
-#else
-# define machine_is_stareast()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DSPG_DW
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DSPG_DW
-# endif
-# define machine_is_dspg_dw()	(machine_arch_type == MACH_TYPE_DSPG_DW)
-#else
-# define machine_is_dspg_dw()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ONEARM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ONEARM
-# endif
-# define machine_is_onearm()	(machine_arch_type == MACH_TYPE_ONEARM)
-#else
-# define machine_is_onearm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MRG110_6
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MRG110_6
-# endif
-# define machine_is_mrg110_6()	(machine_arch_type == MACH_TYPE_MRG110_6)
-#else
-# define machine_is_mrg110_6()	(0)
-#endif
-
-#ifdef CONFIG_MACH_WRT300NV2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WRT300NV2
-# endif
-# define machine_is_wrt300nv2()	(machine_arch_type == MACH_TYPE_WRT300NV2)
-#else
-# define machine_is_wrt300nv2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_XM_BULVERDE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XM_BULVERDE
-# endif
-# define machine_is_xm_bulverde()	(machine_arch_type == MACH_TYPE_XM_BULVERDE)
-#else
-# define machine_is_xm_bulverde()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MSM6100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MSM6100
-# endif
-# define machine_is_msm6100()	(machine_arch_type == MACH_TYPE_MSM6100)
-#else
-# define machine_is_msm6100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ETI_B1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ETI_B1
-# endif
-# define machine_is_eti_b1()	(machine_arch_type == MACH_TYPE_ETI_B1)
-#else
-# define machine_is_eti_b1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZILOG_ZA9L
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZILOG_ZA9L
-# endif
-# define machine_is_za9l_series()	(machine_arch_type == MACH_TYPE_ZILOG_ZA9L)
-#else
-# define machine_is_za9l_series()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BIT2440
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BIT2440
-# endif
-# define machine_is_bit2440()	(machine_arch_type == MACH_TYPE_BIT2440)
-#else
-# define machine_is_bit2440()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NBI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NBI
-# endif
-# define machine_is_nbi()	(machine_arch_type == MACH_TYPE_NBI)
-#else
-# define machine_is_nbi()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK2443
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMDK2443
-# endif
-# define machine_is_smdk2443()	(machine_arch_type == MACH_TYPE_SMDK2443)
-#else
-# define machine_is_smdk2443()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VDAVINCI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VDAVINCI
-# endif
-# define machine_is_vdavinci()	(machine_arch_type == MACH_TYPE_VDAVINCI)
-#else
-# define machine_is_vdavinci()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ATC6
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ATC6
-# endif
-# define machine_is_atc6()	(machine_arch_type == MACH_TYPE_ATC6)
-#else
-# define machine_is_atc6()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MULTMDW
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MULTMDW
-# endif
-# define machine_is_multmdw()	(machine_arch_type == MACH_TYPE_MULTMDW)
-#else
-# define machine_is_multmdw()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MBA2440
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MBA2440
-# endif
-# define machine_is_mba2440()	(machine_arch_type == MACH_TYPE_MBA2440)
-#else
-# define machine_is_mba2440()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ECSD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ECSD
-# endif
-# define machine_is_ecsd()	(machine_arch_type == MACH_TYPE_ECSD)
-#else
-# define machine_is_ecsd()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PALMZ31
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PALMZ31
-# endif
-# define machine_is_palmz31()	(machine_arch_type == MACH_TYPE_PALMZ31)
-#else
-# define machine_is_palmz31()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FSG
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FSG
-# endif
-# define machine_is_fsg()	(machine_arch_type == MACH_TYPE_FSG)
-#else
-# define machine_is_fsg()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RAZOR101
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RAZOR101
-# endif
-# define machine_is_razor101()	(machine_arch_type == MACH_TYPE_RAZOR101)
-#else
-# define machine_is_razor101()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OPERA_TDM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OPERA_TDM
-# endif
-# define machine_is_opera_tdm()	(machine_arch_type == MACH_TYPE_OPERA_TDM)
-#else
-# define machine_is_opera_tdm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_COMCERTO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_COMCERTO
-# endif
-# define machine_is_comcerto()	(machine_arch_type == MACH_TYPE_COMCERTO)
-#else
-# define machine_is_comcerto()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TB0319
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TB0319
-# endif
-# define machine_is_tb0319()	(machine_arch_type == MACH_TYPE_TB0319)
-#else
-# define machine_is_tb0319()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KWS8000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KWS8000
-# endif
-# define machine_is_kws8000()	(machine_arch_type == MACH_TYPE_KWS8000)
-#else
-# define machine_is_kws8000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_B2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_B2
-# endif
-# define machine_is_b2()	(machine_arch_type == MACH_TYPE_B2)
-#else
-# define machine_is_b2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LCL54
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LCL54
-# endif
-# define machine_is_lcl54()	(machine_arch_type == MACH_TYPE_LCL54)
-#else
-# define machine_is_lcl54()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM9260EK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91SAM9260EK
-# endif
-# define machine_is_at91sam9260ek()	(machine_arch_type == MACH_TYPE_AT91SAM9260EK)
-#else
-# define machine_is_at91sam9260ek()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GLANTANK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GLANTANK
-# endif
-# define machine_is_glantank()	(machine_arch_type == MACH_TYPE_GLANTANK)
-#else
-# define machine_is_glantank()	(0)
-#endif
-
-#ifdef CONFIG_MACH_N2100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_N2100
-# endif
-# define machine_is_n2100()	(machine_arch_type == MACH_TYPE_N2100)
-#else
-# define machine_is_n2100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_N4100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_N4100
-# endif
-# define machine_is_n4100()	(machine_arch_type == MACH_TYPE_N4100)
-#else
-# define machine_is_n4100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VERTICAL_RSC4
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VERTICAL_RSC4
-# endif
-# define machine_is_rsc4()	(machine_arch_type == MACH_TYPE_VERTICAL_RSC4)
-#else
-# define machine_is_rsc4()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SG8100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SG8100
-# endif
-# define machine_is_sg8100()	(machine_arch_type == MACH_TYPE_SG8100)
-#else
-# define machine_is_sg8100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IM42XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IM42XX
-# endif
-# define machine_is_im42xx()	(machine_arch_type == MACH_TYPE_IM42XX)
-#else
-# define machine_is_im42xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FTXX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FTXX
-# endif
-# define machine_is_ftxx()	(machine_arch_type == MACH_TYPE_FTXX)
-#else
-# define machine_is_ftxx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LWFUSION
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LWFUSION
-# endif
-# define machine_is_lwfusion()	(machine_arch_type == MACH_TYPE_LWFUSION)
-#else
-# define machine_is_lwfusion()	(0)
-#endif
-
-#ifdef CONFIG_MACH_QT2410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_QT2410
-# endif
-# define machine_is_qt2410()	(machine_arch_type == MACH_TYPE_QT2410)
-#else
-# define machine_is_qt2410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KIXRP435
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KIXRP435
-# endif
-# define machine_is_kixrp435()	(machine_arch_type == MACH_TYPE_KIXRP435)
-#else
-# define machine_is_kixrp435()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CCW9C
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CCW9C
-# endif
-# define machine_is_ccw9c()	(machine_arch_type == MACH_TYPE_CCW9C)
-#else
-# define machine_is_ccw9c()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DABHS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DABHS
-# endif
-# define machine_is_dabhs()	(machine_arch_type == MACH_TYPE_DABHS)
-#else
-# define machine_is_dabhs()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GZMX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GZMX
-# endif
-# define machine_is_gzmx()	(machine_arch_type == MACH_TYPE_GZMX)
-#else
-# define machine_is_gzmx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IPNW100AP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IPNW100AP
-# endif
-# define machine_is_ipnw100ap()	(machine_arch_type == MACH_TYPE_IPNW100AP)
-#else
-# define machine_is_ipnw100ap()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CC9P9360DEV
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CC9P9360DEV
-# endif
-# define machine_is_cc9p9360dev()	(machine_arch_type == MACH_TYPE_CC9P9360DEV)
-#else
-# define machine_is_cc9p9360dev()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CC9P9750DEV
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CC9P9750DEV
-# endif
-# define machine_is_cc9p9750dev()	(machine_arch_type == MACH_TYPE_CC9P9750DEV)
-#else
-# define machine_is_cc9p9750dev()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CC9P9360VAL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CC9P9360VAL
-# endif
-# define machine_is_cc9p9360val()	(machine_arch_type == MACH_TYPE_CC9P9360VAL)
-#else
-# define machine_is_cc9p9360val()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CC9P9750VAL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CC9P9750VAL
-# endif
-# define machine_is_cc9p9750val()	(machine_arch_type == MACH_TYPE_CC9P9750VAL)
-#else
-# define machine_is_cc9p9750val()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NX70V
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NX70V
-# endif
-# define machine_is_nx70v()	(machine_arch_type == MACH_TYPE_NX70V)
-#else
-# define machine_is_nx70v()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91RM9200DF
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91RM9200DF
-# endif
-# define machine_is_at91rm9200df()	(machine_arch_type == MACH_TYPE_AT91RM9200DF)
-#else
-# define machine_is_at91rm9200df()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SE_PILOT2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SE_PILOT2
-# endif
-# define machine_is_se_pilot2()	(machine_arch_type == MACH_TYPE_SE_PILOT2)
-#else
-# define machine_is_se_pilot2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MTCN_T800
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MTCN_T800
-# endif
-# define machine_is_mtcn_t800()	(machine_arch_type == MACH_TYPE_MTCN_T800)
-#else
-# define machine_is_mtcn_t800()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VCMX212
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VCMX212
-# endif
-# define machine_is_vcmx212()	(machine_arch_type == MACH_TYPE_VCMX212)
-#else
-# define machine_is_vcmx212()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LYNX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LYNX
-# endif
-# define machine_is_lynx()	(machine_arch_type == MACH_TYPE_LYNX)
-#else
-# define machine_is_lynx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM9260ID
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91SAM9260ID
-# endif
-# define machine_is_at91sam9260id()	(machine_arch_type == MACH_TYPE_AT91SAM9260ID)
-#else
-# define machine_is_at91sam9260id()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HW86052
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HW86052
-# endif
-# define machine_is_hw86052()	(machine_arch_type == MACH_TYPE_HW86052)
-#else
-# define machine_is_hw86052()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PILZ_PMI3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PILZ_PMI3
-# endif
-# define machine_is_pilz_pmi3()	(machine_arch_type == MACH_TYPE_PILZ_PMI3)
-#else
-# define machine_is_pilz_pmi3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EDB9302A
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EDB9302A
-# endif
-# define machine_is_edb9302a()	(machine_arch_type == MACH_TYPE_EDB9302A)
-#else
-# define machine_is_edb9302a()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EDB9307A
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EDB9307A
-# endif
-# define machine_is_edb9307a()	(machine_arch_type == MACH_TYPE_EDB9307A)
-#else
-# define machine_is_edb9307a()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CT_DFS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CT_DFS
-# endif
-# define machine_is_ct_dfs()	(machine_arch_type == MACH_TYPE_CT_DFS)
-#else
-# define machine_is_ct_dfs()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PILZ_PMI4
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PILZ_PMI4
-# endif
-# define machine_is_pilz_pmi4()	(machine_arch_type == MACH_TYPE_PILZ_PMI4)
-#else
-# define machine_is_pilz_pmi4()	(0)
-#endif
-
-#ifdef CONFIG_MACH_XCEEDNP_IXP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XCEEDNP_IXP
-# endif
-# define machine_is_xceednp_ixp()	(machine_arch_type == MACH_TYPE_XCEEDNP_IXP)
-#else
-# define machine_is_xceednp_ixp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK2442B
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMDK2442B
-# endif
-# define machine_is_smdk2442b()	(machine_arch_type == MACH_TYPE_SMDK2442B)
-#else
-# define machine_is_smdk2442b()	(0)
-#endif
-
-#ifdef CONFIG_MACH_XNODE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XNODE
-# endif
-# define machine_is_xnode()	(machine_arch_type == MACH_TYPE_XNODE)
-#else
-# define machine_is_xnode()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AIDX270
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AIDX270
-# endif
-# define machine_is_aidx270()	(machine_arch_type == MACH_TYPE_AIDX270)
-#else
-# define machine_is_aidx270()	(0)
-#endif
-
-#ifdef CONFIG_MACH_REMA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_REMA
-# endif
-# define machine_is_rema()	(machine_arch_type == MACH_TYPE_REMA)
-#else
-# define machine_is_rema()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BPS1000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BPS1000
-# endif
-# define machine_is_bps1000()	(machine_arch_type == MACH_TYPE_BPS1000)
-#else
-# define machine_is_bps1000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HW90350
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HW90350
-# endif
-# define machine_is_hw90350()	(machine_arch_type == MACH_TYPE_HW90350)
-#else
-# define machine_is_hw90350()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_3430SDP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_3430SDP
-# endif
-# define machine_is_omap_3430sdp()	(machine_arch_type == MACH_TYPE_OMAP_3430SDP)
-#else
-# define machine_is_omap_3430sdp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BLUETOUCH
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BLUETOUCH
-# endif
-# define machine_is_bluetouch()	(machine_arch_type == MACH_TYPE_BLUETOUCH)
-#else
-# define machine_is_bluetouch()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VSTMS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VSTMS
-# endif
-# define machine_is_vstms()	(machine_arch_type == MACH_TYPE_VSTMS)
-#else
-# define machine_is_vstms()	(0)
-#endif
-
-#ifdef CONFIG_MACH_XSBASE270
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XSBASE270
-# endif
-# define machine_is_xsbase270()	(machine_arch_type == MACH_TYPE_XSBASE270)
-#else
-# define machine_is_xsbase270()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM9260EK_CN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91SAM9260EK_CN
-# endif
-# define machine_is_at91sam9260ek_cn()	(machine_arch_type == MACH_TYPE_AT91SAM9260EK_CN)
-#else
-# define machine_is_at91sam9260ek_cn()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ADSTURBOXB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADSTURBOXB
-# endif
-# define machine_is_adsturboxb()	(machine_arch_type == MACH_TYPE_ADSTURBOXB)
-#else
-# define machine_is_adsturboxb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OTI4110
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OTI4110
-# endif
-# define machine_is_oti4110()	(machine_arch_type == MACH_TYPE_OTI4110)
-#else
-# define machine_is_oti4110()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HME_PXA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HME_PXA
-# endif
-# define machine_is_hme_pxa()	(machine_arch_type == MACH_TYPE_HME_PXA)
-#else
-# define machine_is_hme_pxa()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DEISTERDCA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DEISTERDCA
-# endif
-# define machine_is_deisterdca()	(machine_arch_type == MACH_TYPE_DEISTERDCA)
-#else
-# define machine_is_deisterdca()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CES_SSEM2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CES_SSEM2
-# endif
-# define machine_is_ces_ssem2()	(machine_arch_type == MACH_TYPE_CES_SSEM2)
-#else
-# define machine_is_ces_ssem2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CES_MTR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CES_MTR
-# endif
-# define machine_is_ces_mtr()	(machine_arch_type == MACH_TYPE_CES_MTR)
-#else
-# define machine_is_ces_mtr()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TDS_AVNG_SBC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TDS_AVNG_SBC
-# endif
-# define machine_is_tds_avng_sbc()	(machine_arch_type == MACH_TYPE_TDS_AVNG_SBC)
-#else
-# define machine_is_tds_avng_sbc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EVEREST
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EVEREST
-# endif
-# define machine_is_everest()	(machine_arch_type == MACH_TYPE_EVEREST)
-#else
-# define machine_is_everest()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PNX4010
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PNX4010
-# endif
-# define machine_is_pnx4010()	(machine_arch_type == MACH_TYPE_PNX4010)
-#else
-# define machine_is_pnx4010()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OXNAS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OXNAS
-# endif
-# define machine_is_oxnas()	(machine_arch_type == MACH_TYPE_OXNAS)
-#else
-# define machine_is_oxnas()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FIORI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FIORI
-# endif
-# define machine_is_fiori()	(machine_arch_type == MACH_TYPE_FIORI)
-#else
-# define machine_is_fiori()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ML1200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ML1200
-# endif
-# define machine_is_ml1200()	(machine_arch_type == MACH_TYPE_ML1200)
-#else
-# define machine_is_ml1200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PECOS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PECOS
-# endif
-# define machine_is_pecos()	(machine_arch_type == MACH_TYPE_PECOS)
-#else
-# define machine_is_pecos()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NB2XXX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NB2XXX
-# endif
-# define machine_is_nb2xxx()	(machine_arch_type == MACH_TYPE_NB2XXX)
-#else
-# define machine_is_nb2xxx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HW6900
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HW6900
-# endif
-# define machine_is_hw6900()	(machine_arch_type == MACH_TYPE_HW6900)
-#else
-# define machine_is_hw6900()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CDCS_QUOLL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CDCS_QUOLL
-# endif
-# define machine_is_cdcs_quoll()	(machine_arch_type == MACH_TYPE_CDCS_QUOLL)
-#else
-# define machine_is_cdcs_quoll()	(0)
-#endif
-
-#ifdef CONFIG_MACH_QUICKSILVER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_QUICKSILVER
-# endif
-# define machine_is_quicksilver()	(machine_arch_type == MACH_TYPE_QUICKSILVER)
-#else
-# define machine_is_quicksilver()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UPLAT926
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UPLAT926
-# endif
-# define machine_is_uplat926()	(machine_arch_type == MACH_TYPE_UPLAT926)
-#else
-# define machine_is_uplat926()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DEP2410_THOMAS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DEP2410_THOMAS
-# endif
-# define machine_is_dep2410_dep2410()	(machine_arch_type == MACH_TYPE_DEP2410_THOMAS)
-#else
-# define machine_is_dep2410_dep2410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DTK2410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DTK2410
-# endif
-# define machine_is_dtk2410()	(machine_arch_type == MACH_TYPE_DTK2410)
-#else
-# define machine_is_dtk2410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CHILI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CHILI
-# endif
-# define machine_is_chili()	(machine_arch_type == MACH_TYPE_CHILI)
-#else
-# define machine_is_chili()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DEMETER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DEMETER
-# endif
-# define machine_is_demeter()	(machine_arch_type == MACH_TYPE_DEMETER)
-#else
-# define machine_is_demeter()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DIONYSUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DIONYSUS
-# endif
-# define machine_is_dionysus()	(machine_arch_type == MACH_TYPE_DIONYSUS)
-#else
-# define machine_is_dionysus()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AS352X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AS352X
-# endif
-# define machine_is_as352x()	(machine_arch_type == MACH_TYPE_AS352X)
-#else
-# define machine_is_as352x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SERVICE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SERVICE
-# endif
-# define machine_is_service()	(machine_arch_type == MACH_TYPE_SERVICE)
-#else
-# define machine_is_service()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CS_E9301
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CS_E9301
-# endif
-# define machine_is_cs_e9301()	(machine_arch_type == MACH_TYPE_CS_E9301)
-#else
-# define machine_is_cs_e9301()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MICRO9M
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MICRO9M
-# endif
-# define machine_is_micro9m()	(machine_arch_type == MACH_TYPE_MICRO9M)
-#else
-# define machine_is_micro9m()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IA_MOSPCK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IA_MOSPCK
-# endif
-# define machine_is_ia_mospck()	(machine_arch_type == MACH_TYPE_IA_MOSPCK)
-#else
-# define machine_is_ia_mospck()	(0)
-#endif
-
-#ifdef CONFIG_MACH_QL201B
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_QL201B
-# endif
-# define machine_is_ql201b()	(machine_arch_type == MACH_TYPE_QL201B)
-#else
-# define machine_is_ql201b()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BBM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BBM
-# endif
-# define machine_is_bbm()	(machine_arch_type == MACH_TYPE_BBM)
-#else
-# define machine_is_bbm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EXXX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EXXX
-# endif
-# define machine_is_exxx()	(machine_arch_type == MACH_TYPE_EXXX)
-#else
-# define machine_is_exxx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_WMA11B
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WMA11B
-# endif
-# define machine_is_wma11b()	(machine_arch_type == MACH_TYPE_WMA11B)
-#else
-# define machine_is_wma11b()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PELCO_ATLAS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PELCO_ATLAS
-# endif
-# define machine_is_pelco_atlas()	(machine_arch_type == MACH_TYPE_PELCO_ATLAS)
-#else
-# define machine_is_pelco_atlas()	(0)
-#endif
-
-#ifdef CONFIG_MACH_G500
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_G500
-# endif
-# define machine_is_g500()	(machine_arch_type == MACH_TYPE_G500)
-#else
-# define machine_is_g500()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BUG
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BUG
-# endif
-# define machine_is_bug()	(machine_arch_type == MACH_TYPE_BUG)
-#else
-# define machine_is_bug()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX33ADS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX33ADS
-# endif
-# define machine_is_mx33ads()	(machine_arch_type == MACH_TYPE_MX33ADS)
-#else
-# define machine_is_mx33ads()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CHUB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CHUB
-# endif
-# define machine_is_chub()	(machine_arch_type == MACH_TYPE_CHUB)
-#else
-# define machine_is_chub()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NEO1973_GTA01
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NEO1973_GTA01
-# endif
-# define machine_is_neo1973_gta01()	(machine_arch_type == MACH_TYPE_NEO1973_GTA01)
-#else
-# define machine_is_neo1973_gta01()	(0)
-#endif
-
-#ifdef CONFIG_MACH_W90N740
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_W90N740
-# endif
-# define machine_is_w90n740()	(machine_arch_type == MACH_TYPE_W90N740)
-#else
-# define machine_is_w90n740()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MEDALLION_SA2410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MEDALLION_SA2410
-# endif
-# define machine_is_medallion_sa2410()	(machine_arch_type == MACH_TYPE_MEDALLION_SA2410)
-#else
-# define machine_is_medallion_sa2410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IA_CPU_9200_2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IA_CPU_9200_2
-# endif
-# define machine_is_ia_cpu_9200_2()	(machine_arch_type == MACH_TYPE_IA_CPU_9200_2)
-#else
-# define machine_is_ia_cpu_9200_2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DIMMRM9200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DIMMRM9200
-# endif
-# define machine_is_dimmrm9200()	(machine_arch_type == MACH_TYPE_DIMMRM9200)
-#else
-# define machine_is_dimmrm9200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PM9261
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PM9261
-# endif
-# define machine_is_pm9261()	(machine_arch_type == MACH_TYPE_PM9261)
-#else
-# define machine_is_pm9261()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ML7304
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ML7304
-# endif
-# define machine_is_ml7304()	(machine_arch_type == MACH_TYPE_ML7304)
-#else
-# define machine_is_ml7304()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UCP250
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UCP250
-# endif
-# define machine_is_ucp250()	(machine_arch_type == MACH_TYPE_UCP250)
-#else
-# define machine_is_ucp250()	(0)
-#endif
-
-#ifdef CONFIG_MACH_INTBOARD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_INTBOARD
-# endif
-# define machine_is_intboard()	(machine_arch_type == MACH_TYPE_INTBOARD)
-#else
-# define machine_is_intboard()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GULFSTREAM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GULFSTREAM
-# endif
-# define machine_is_gulfstream()	(machine_arch_type == MACH_TYPE_GULFSTREAM)
-#else
-# define machine_is_gulfstream()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LABQUEST
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LABQUEST
-# endif
-# define machine_is_labquest()	(machine_arch_type == MACH_TYPE_LABQUEST)
-#else
-# define machine_is_labquest()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VCMX313
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VCMX313
-# endif
-# define machine_is_vcmx313()	(machine_arch_type == MACH_TYPE_VCMX313)
-#else
-# define machine_is_vcmx313()	(0)
-#endif
-
-#ifdef CONFIG_MACH_URG200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_URG200
-# endif
-# define machine_is_urg200()	(machine_arch_type == MACH_TYPE_URG200)
-#else
-# define machine_is_urg200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CPUX255LCDNET
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CPUX255LCDNET
-# endif
-# define machine_is_cpux255lcdnet()	(machine_arch_type == MACH_TYPE_CPUX255LCDNET)
-#else
-# define machine_is_cpux255lcdnet()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NETDCU9
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NETDCU9
-# endif
-# define machine_is_netdcu9()	(machine_arch_type == MACH_TYPE_NETDCU9)
-#else
-# define machine_is_netdcu9()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NETDCU10
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NETDCU10
-# endif
-# define machine_is_netdcu10()	(machine_arch_type == MACH_TYPE_NETDCU10)
-#else
-# define machine_is_netdcu10()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DSPG_DGA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DSPG_DGA
-# endif
-# define machine_is_dspg_dga()	(machine_arch_type == MACH_TYPE_DSPG_DGA)
-#else
-# define machine_is_dspg_dga()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DSPG_DVW
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DSPG_DVW
-# endif
-# define machine_is_dspg_dvw()	(machine_arch_type == MACH_TYPE_DSPG_DVW)
-#else
-# define machine_is_dspg_dvw()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SOLOS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SOLOS
-# endif
-# define machine_is_solos()	(machine_arch_type == MACH_TYPE_SOLOS)
-#else
-# define machine_is_solos()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM9263EK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91SAM9263EK
-# endif
-# define machine_is_at91sam9263ek()	(machine_arch_type == MACH_TYPE_AT91SAM9263EK)
-#else
-# define machine_is_at91sam9263ek()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OSSTBOX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OSSTBOX
-# endif
-# define machine_is_osstbox()	(machine_arch_type == MACH_TYPE_OSSTBOX)
-#else
-# define machine_is_osstbox()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KBAT9261
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KBAT9261
-# endif
-# define machine_is_kbat9261()	(machine_arch_type == MACH_TYPE_KBAT9261)
-#else
-# define machine_is_kbat9261()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CT1100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CT1100
-# endif
-# define machine_is_ct1100()	(machine_arch_type == MACH_TYPE_CT1100)
-#else
-# define machine_is_ct1100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AKCPPXA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AKCPPXA
-# endif
-# define machine_is_akcppxa()	(machine_arch_type == MACH_TYPE_AKCPPXA)
-#else
-# define machine_is_akcppxa()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OCHAYA1020
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OCHAYA1020
-# endif
-# define machine_is_ochaya1020()	(machine_arch_type == MACH_TYPE_OCHAYA1020)
-#else
-# define machine_is_ochaya1020()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HITRACK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HITRACK
-# endif
-# define machine_is_hitrack()	(machine_arch_type == MACH_TYPE_HITRACK)
-#else
-# define machine_is_hitrack()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SYME1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SYME1
-# endif
-# define machine_is_syme1()	(machine_arch_type == MACH_TYPE_SYME1)
-#else
-# define machine_is_syme1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SYHL1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SYHL1
-# endif
-# define machine_is_syhl1()	(machine_arch_type == MACH_TYPE_SYHL1)
-#else
-# define machine_is_syhl1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EMPCA400
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EMPCA400
-# endif
-# define machine_is_empca400()	(machine_arch_type == MACH_TYPE_EMPCA400)
-#else
-# define machine_is_empca400()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EM7210
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EM7210
-# endif
-# define machine_is_em7210()	(machine_arch_type == MACH_TYPE_EM7210)
-#else
-# define machine_is_em7210()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCHERMES
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCHERMES
-# endif
-# define machine_is_htchermes()	(machine_arch_type == MACH_TYPE_HTCHERMES)
-#else
-# define machine_is_htchermes()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ETI_C1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ETI_C1
-# endif
-# define machine_is_eti_c1()	(machine_arch_type == MACH_TYPE_ETI_C1)
-#else
-# define machine_is_eti_c1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AC100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AC100
-# endif
-# define machine_is_ac100()	(machine_arch_type == MACH_TYPE_AC100)
-#else
-# define machine_is_ac100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SNEETCH
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SNEETCH
-# endif
-# define machine_is_sneetch()	(machine_arch_type == MACH_TYPE_SNEETCH)
-#else
-# define machine_is_sneetch()	(0)
-#endif
-
-#ifdef CONFIG_MACH_STUDENTMATE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STUDENTMATE
-# endif
-# define machine_is_studentmate()	(machine_arch_type == MACH_TYPE_STUDENTMATE)
-#else
-# define machine_is_studentmate()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZIR2410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZIR2410
-# endif
-# define machine_is_zir2410()	(machine_arch_type == MACH_TYPE_ZIR2410)
-#else
-# define machine_is_zir2410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZIR2413
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZIR2413
-# endif
-# define machine_is_zir2413()	(machine_arch_type == MACH_TYPE_ZIR2413)
-#else
-# define machine_is_zir2413()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DLONIP3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DLONIP3
-# endif
-# define machine_is_dlonip3()	(machine_arch_type == MACH_TYPE_DLONIP3)
-#else
-# define machine_is_dlonip3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_INSTREAM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_INSTREAM
-# endif
-# define machine_is_instream()	(machine_arch_type == MACH_TYPE_INSTREAM)
-#else
-# define machine_is_instream()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AMBARELLA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AMBARELLA
-# endif
-# define machine_is_ambarella()	(machine_arch_type == MACH_TYPE_AMBARELLA)
-#else
-# define machine_is_ambarella()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NEVIS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NEVIS
-# endif
-# define machine_is_nevis()	(machine_arch_type == MACH_TYPE_NEVIS)
-#else
-# define machine_is_nevis()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTC_TRINITY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTC_TRINITY
-# endif
-# define machine_is_htc_trinity()	(machine_arch_type == MACH_TYPE_HTC_TRINITY)
-#else
-# define machine_is_htc_trinity()	(0)
-#endif
-
-#ifdef CONFIG_MACH_QL202B
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_QL202B
-# endif
-# define machine_is_ql202b()	(machine_arch_type == MACH_TYPE_QL202B)
-#else
-# define machine_is_ql202b()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VPAC270
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VPAC270
-# endif
-# define machine_is_vpac270()	(machine_arch_type == MACH_TYPE_VPAC270)
-#else
-# define machine_is_vpac270()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RD129
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RD129
-# endif
-# define machine_is_rd129()	(machine_arch_type == MACH_TYPE_RD129)
-#else
-# define machine_is_rd129()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCWIZARD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCWIZARD
-# endif
-# define machine_is_htcwizard()	(machine_arch_type == MACH_TYPE_HTCWIZARD)
-#else
-# define machine_is_htcwizard()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TREO680
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TREO680
-# endif
-# define machine_is_treo680()	(machine_arch_type == MACH_TYPE_TREO680)
-#else
-# define machine_is_treo680()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TECON_TMEZON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TECON_TMEZON
-# endif
-# define machine_is_tecon_tmezon()	(machine_arch_type == MACH_TYPE_TECON_TMEZON)
-#else
-# define machine_is_tecon_tmezon()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZYLONITE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZYLONITE
-# endif
-# define machine_is_zylonite()	(machine_arch_type == MACH_TYPE_ZYLONITE)
-#else
-# define machine_is_zylonite()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GENE1270
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GENE1270
-# endif
-# define machine_is_gene1270()	(machine_arch_type == MACH_TYPE_GENE1270)
-#else
-# define machine_is_gene1270()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZIR2412
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZIR2412
-# endif
-# define machine_is_zir2412()	(machine_arch_type == MACH_TYPE_ZIR2412)
-#else
-# define machine_is_zir2412()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX31LITE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX31LITE
-# endif
-# define machine_is_mx31lite()	(machine_arch_type == MACH_TYPE_MX31LITE)
-#else
-# define machine_is_mx31lite()	(0)
-#endif
-
-#ifdef CONFIG_MACH_T700WX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_T700WX
-# endif
-# define machine_is_t700wx()	(machine_arch_type == MACH_TYPE_T700WX)
-#else
-# define machine_is_t700wx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VF100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VF100
-# endif
-# define machine_is_vf100()	(machine_arch_type == MACH_TYPE_VF100)
-#else
-# define machine_is_vf100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NSB2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NSB2
-# endif
-# define machine_is_nsb2()	(machine_arch_type == MACH_TYPE_NSB2)
-#else
-# define machine_is_nsb2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NXHMI_BB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NXHMI_BB
-# endif
-# define machine_is_nxhmi_bb()	(machine_arch_type == MACH_TYPE_NXHMI_BB)
-#else
-# define machine_is_nxhmi_bb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NXHMI_RE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NXHMI_RE
-# endif
-# define machine_is_nxhmi_re()	(machine_arch_type == MACH_TYPE_NXHMI_RE)
-#else
-# define machine_is_nxhmi_re()	(0)
-#endif
-
-#ifdef CONFIG_MACH_N4100PRO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_N4100PRO
-# endif
-# define machine_is_n4100pro()	(machine_arch_type == MACH_TYPE_N4100PRO)
-#else
-# define machine_is_n4100pro()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SAM9260
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SAM9260
-# endif
-# define machine_is_sam9260()	(machine_arch_type == MACH_TYPE_SAM9260)
-#else
-# define machine_is_sam9260()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_TREO600
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_TREO600
-# endif
-# define machine_is_omap_treo600()	(machine_arch_type == MACH_TYPE_OMAP_TREO600)
-#else
-# define machine_is_omap_treo600()	(0)
-#endif
-
-#ifdef CONFIG_MACH_INDY2410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_INDY2410
-# endif
-# define machine_is_indy2410()	(machine_arch_type == MACH_TYPE_INDY2410)
-#else
-# define machine_is_indy2410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NELT_A
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NELT_A
-# endif
-# define machine_is_nelt_a()	(machine_arch_type == MACH_TYPE_NELT_A)
-#else
-# define machine_is_nelt_a()	(0)
-#endif
-
-#ifdef CONFIG_MACH_N311
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_N311
-# endif
-# define machine_is_n311()	(machine_arch_type == MACH_TYPE_N311)
-#else
-# define machine_is_n311()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM9260VGK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91SAM9260VGK
-# endif
-# define machine_is_at91sam9260vgk()	(machine_arch_type == MACH_TYPE_AT91SAM9260VGK)
-#else
-# define machine_is_at91sam9260vgk()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91LEPPE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91LEPPE
-# endif
-# define machine_is_at91leppe()	(machine_arch_type == MACH_TYPE_AT91LEPPE)
-#else
-# define machine_is_at91leppe()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91LEPCCN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91LEPCCN
-# endif
-# define machine_is_at91lepccn()	(machine_arch_type == MACH_TYPE_AT91LEPCCN)
-#else
-# define machine_is_at91lepccn()	(0)
-#endif
-
-#ifdef CONFIG_MACH_APC7100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_APC7100
-# endif
-# define machine_is_apc7100()	(machine_arch_type == MACH_TYPE_APC7100)
-#else
-# define machine_is_apc7100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_STARGAZER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STARGAZER
-# endif
-# define machine_is_stargazer()	(machine_arch_type == MACH_TYPE_STARGAZER)
-#else
-# define machine_is_stargazer()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SONATA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SONATA
-# endif
-# define machine_is_sonata()	(machine_arch_type == MACH_TYPE_SONATA)
-#else
-# define machine_is_sonata()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SCHMOOGIE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SCHMOOGIE
-# endif
-# define machine_is_schmoogie()	(machine_arch_type == MACH_TYPE_SCHMOOGIE)
-#else
-# define machine_is_schmoogie()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AZTOOL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AZTOOL
-# endif
-# define machine_is_aztool()	(machine_arch_type == MACH_TYPE_AZTOOL)
-#else
-# define machine_is_aztool()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MIOA701
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MIOA701
-# endif
-# define machine_is_mioa701()	(machine_arch_type == MACH_TYPE_MIOA701)
-#else
-# define machine_is_mioa701()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SXNI9260
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SXNI9260
-# endif
-# define machine_is_sxni9260()	(machine_arch_type == MACH_TYPE_SXNI9260)
-#else
-# define machine_is_sxni9260()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MXC27520EVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MXC27520EVB
-# endif
-# define machine_is_mxc27520evb()	(machine_arch_type == MACH_TYPE_MXC27520EVB)
-#else
-# define machine_is_mxc27520evb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARMADILLO5X0
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARMADILLO5X0
-# endif
-# define machine_is_armadillo5x0()	(machine_arch_type == MACH_TYPE_ARMADILLO5X0)
-#else
-# define machine_is_armadillo5x0()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MB9260
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MB9260
-# endif
-# define machine_is_mb9260()	(machine_arch_type == MACH_TYPE_MB9260)
-#else
-# define machine_is_mb9260()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MB9263
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MB9263
-# endif
-# define machine_is_mb9263()	(machine_arch_type == MACH_TYPE_MB9263)
-#else
-# define machine_is_mb9263()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IPAC9302
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IPAC9302
-# endif
-# define machine_is_ipac9302()	(machine_arch_type == MACH_TYPE_IPAC9302)
-#else
-# define machine_is_ipac9302()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CC9P9360JS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CC9P9360JS
-# endif
-# define machine_is_cc9p9360js()	(machine_arch_type == MACH_TYPE_CC9P9360JS)
-#else
-# define machine_is_cc9p9360js()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GALLIUM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GALLIUM
-# endif
-# define machine_is_gallium()	(machine_arch_type == MACH_TYPE_GALLIUM)
-#else
-# define machine_is_gallium()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MSC2410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MSC2410
-# endif
-# define machine_is_msc2410()	(machine_arch_type == MACH_TYPE_MSC2410)
-#else
-# define machine_is_msc2410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GHI270
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GHI270
-# endif
-# define machine_is_ghi270()	(machine_arch_type == MACH_TYPE_GHI270)
-#else
-# define machine_is_ghi270()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_LEONARDO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DAVINCI_LEONARDO
-# endif
-# define machine_is_davinci_leonardo()	(machine_arch_type == MACH_TYPE_DAVINCI_LEONARDO)
-#else
-# define machine_is_davinci_leonardo()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OIAB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OIAB
-# endif
-# define machine_is_oiab()	(machine_arch_type == MACH_TYPE_OIAB)
-#else
-# define machine_is_oiab()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK6400
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMDK6400
-# endif
-# define machine_is_smdk6400()	(machine_arch_type == MACH_TYPE_SMDK6400)
-#else
-# define machine_is_smdk6400()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NOKIA_N800
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NOKIA_N800
-# endif
-# define machine_is_nokia_n800()	(machine_arch_type == MACH_TYPE_NOKIA_N800)
-#else
-# define machine_is_nokia_n800()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GREENPHONE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GREENPHONE
-# endif
-# define machine_is_greenphone()	(machine_arch_type == MACH_TYPE_GREENPHONE)
-#else
-# define machine_is_greenphone()	(0)
-#endif
-
-#ifdef CONFIG_MACH_COMPEXWP18
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_COMPEXWP18
-# endif
-# define machine_is_compex42x()	(machine_arch_type == MACH_TYPE_COMPEXWP18)
-#else
-# define machine_is_compex42x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_XMATE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XMATE
-# endif
-# define machine_is_xmate()	(machine_arch_type == MACH_TYPE_XMATE)
-#else
-# define machine_is_xmate()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ENERGIZER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ENERGIZER
-# endif
-# define machine_is_energizer()	(machine_arch_type == MACH_TYPE_ENERGIZER)
-#else
-# define machine_is_energizer()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IME1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IME1
-# endif
-# define machine_is_ime1()	(machine_arch_type == MACH_TYPE_IME1)
-#else
-# define machine_is_ime1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SWEDATMS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SWEDATMS
-# endif
-# define machine_is_sweda_tms()	(machine_arch_type == MACH_TYPE_SWEDATMS)
-#else
-# define machine_is_sweda_tms()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NTNP435C
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NTNP435C
-# endif
-# define machine_is_ntnp435c()	(machine_arch_type == MACH_TYPE_NTNP435C)
-#else
-# define machine_is_ntnp435c()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SPECTRO2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SPECTRO2
-# endif
-# define machine_is_spectro2()	(machine_arch_type == MACH_TYPE_SPECTRO2)
-#else
-# define machine_is_spectro2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_H6039
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_H6039
-# endif
-# define machine_is_h6039()	(machine_arch_type == MACH_TYPE_H6039)
-#else
-# define machine_is_h6039()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EP80219
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EP80219
-# endif
-# define machine_is_ep80219()	(machine_arch_type == MACH_TYPE_EP80219)
-#else
-# define machine_is_ep80219()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SAMOA_II
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SAMOA_II
-# endif
-# define machine_is_samoa_ii()	(machine_arch_type == MACH_TYPE_SAMOA_II)
-#else
-# define machine_is_samoa_ii()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CWMXL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CWMXL
-# endif
-# define machine_is_cwmxl()	(machine_arch_type == MACH_TYPE_CWMXL)
-#else
-# define machine_is_cwmxl()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AS9200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AS9200
-# endif
-# define machine_is_as9200()	(machine_arch_type == MACH_TYPE_AS9200)
-#else
-# define machine_is_as9200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SFX1149
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SFX1149
-# endif
-# define machine_is_sfx1149()	(machine_arch_type == MACH_TYPE_SFX1149)
-#else
-# define machine_is_sfx1149()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NAVI010
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NAVI010
-# endif
-# define machine_is_navi010()	(machine_arch_type == MACH_TYPE_NAVI010)
-#else
-# define machine_is_navi010()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MULTMDP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MULTMDP
-# endif
-# define machine_is_multmdp()	(machine_arch_type == MACH_TYPE_MULTMDP)
-#else
-# define machine_is_multmdp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SCB9520
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SCB9520
-# endif
-# define machine_is_scb9520()	(machine_arch_type == MACH_TYPE_SCB9520)
-#else
-# define machine_is_scb9520()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCATHENA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCATHENA
-# endif
-# define machine_is_htcathena()	(machine_arch_type == MACH_TYPE_HTCATHENA)
-#else
-# define machine_is_htcathena()	(0)
-#endif
-
-#ifdef CONFIG_MACH_XP179
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XP179
-# endif
-# define machine_is_xp179()	(machine_arch_type == MACH_TYPE_XP179)
-#else
-# define machine_is_xp179()	(0)
-#endif
-
-#ifdef CONFIG_MACH_H4300
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_H4300
-# endif
-# define machine_is_h4300()	(machine_arch_type == MACH_TYPE_H4300)
-#else
-# define machine_is_h4300()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GORAMO_MLR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GORAMO_MLR
-# endif
-# define machine_is_goramo_mlr()	(machine_arch_type == MACH_TYPE_GORAMO_MLR)
-#else
-# define machine_is_goramo_mlr()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MXC30020EVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MXC30020EVB
-# endif
-# define machine_is_mxc30020evb()	(machine_arch_type == MACH_TYPE_MXC30020EVB)
-#else
-# define machine_is_mxc30020evb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ADSBITSYG5
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADSBITSYG5
-# endif
-# define machine_is_adsbitsyg5()	(machine_arch_type == MACH_TYPE_ADSBITSYG5)
-#else
-# define machine_is_adsbitsyg5()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ADSPORTALPLUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADSPORTALPLUS
-# endif
-# define machine_is_adsportalplus()	(machine_arch_type == MACH_TYPE_ADSPORTALPLUS)
-#else
-# define machine_is_adsportalplus()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MMSP2PLUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MMSP2PLUS
-# endif
-# define machine_is_mmsp2plus()	(machine_arch_type == MACH_TYPE_MMSP2PLUS)
-#else
-# define machine_is_mmsp2plus()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EM_X270
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EM_X270
-# endif
-# define machine_is_em_x270()	(machine_arch_type == MACH_TYPE_EM_X270)
-#else
-# define machine_is_em_x270()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TPP302
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TPP302
-# endif
-# define machine_is_tpp302()	(machine_arch_type == MACH_TYPE_TPP302)
-#else
-# define machine_is_tpp302()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TPM104
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TPM104
-# endif
-# define machine_is_tpp104()	(machine_arch_type == MACH_TYPE_TPM104)
-#else
-# define machine_is_tpp104()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TPM102
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TPM102
-# endif
-# define machine_is_tpm102()	(machine_arch_type == MACH_TYPE_TPM102)
-#else
-# define machine_is_tpm102()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TPM109
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TPM109
-# endif
-# define machine_is_tpm109()	(machine_arch_type == MACH_TYPE_TPM109)
-#else
-# define machine_is_tpm109()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FBXO1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FBXO1
-# endif
-# define machine_is_fbxo1()	(machine_arch_type == MACH_TYPE_FBXO1)
-#else
-# define machine_is_fbxo1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HXD8
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HXD8
-# endif
-# define machine_is_hxd8()	(machine_arch_type == MACH_TYPE_HXD8)
-#else
-# define machine_is_hxd8()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NEO1973_GTA02
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NEO1973_GTA02
-# endif
-# define machine_is_neo1973_gta02()	(machine_arch_type == MACH_TYPE_NEO1973_GTA02)
-#else
-# define machine_is_neo1973_gta02()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EMTEST
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EMTEST
-# endif
-# define machine_is_emtest()	(machine_arch_type == MACH_TYPE_EMTEST)
-#else
-# define machine_is_emtest()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AD6900
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AD6900
-# endif
-# define machine_is_ad6900()	(machine_arch_type == MACH_TYPE_AD6900)
-#else
-# define machine_is_ad6900()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EUROPA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EUROPA
-# endif
-# define machine_is_europa()	(machine_arch_type == MACH_TYPE_EUROPA)
-#else
-# define machine_is_europa()	(0)
-#endif
-
-#ifdef CONFIG_MACH_METROCONNECT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_METROCONNECT
-# endif
-# define machine_is_metroconnect()	(machine_arch_type == MACH_TYPE_METROCONNECT)
-#else
-# define machine_is_metroconnect()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EZ_S2410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EZ_S2410
-# endif
-# define machine_is_ez_s2410()	(machine_arch_type == MACH_TYPE_EZ_S2410)
-#else
-# define machine_is_ez_s2410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EZ_S2440
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EZ_S2440
-# endif
-# define machine_is_ez_s2440()	(machine_arch_type == MACH_TYPE_EZ_S2440)
-#else
-# define machine_is_ez_s2440()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EZ_EP9312
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EZ_EP9312
-# endif
-# define machine_is_ez_ep9312()	(machine_arch_type == MACH_TYPE_EZ_EP9312)
-#else
-# define machine_is_ez_ep9312()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EZ_EP9315
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EZ_EP9315
-# endif
-# define machine_is_ez_ep9315()	(machine_arch_type == MACH_TYPE_EZ_EP9315)
-#else
-# define machine_is_ez_ep9315()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EZ_X7
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EZ_X7
-# endif
-# define machine_is_ez_x7()	(machine_arch_type == MACH_TYPE_EZ_X7)
-#else
-# define machine_is_ez_x7()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GODOTDB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GODOTDB
-# endif
-# define machine_is_godotdb()	(machine_arch_type == MACH_TYPE_GODOTDB)
-#else
-# define machine_is_godotdb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MISTRAL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MISTRAL
-# endif
-# define machine_is_mistral()	(machine_arch_type == MACH_TYPE_MISTRAL)
-#else
-# define machine_is_mistral()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MSM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MSM
-# endif
-# define machine_is_msm()	(machine_arch_type == MACH_TYPE_MSM)
-#else
-# define machine_is_msm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CT5910
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CT5910
-# endif
-# define machine_is_ct5910()	(machine_arch_type == MACH_TYPE_CT5910)
-#else
-# define machine_is_ct5910()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CT5912
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CT5912
-# endif
-# define machine_is_ct5912()	(machine_arch_type == MACH_TYPE_CT5912)
-#else
-# define machine_is_ct5912()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HYNET_INE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HYNET_INE
-# endif
-# define machine_is_hynet_ine()	(machine_arch_type == MACH_TYPE_HYNET_INE)
-#else
-# define machine_is_hynet_ine()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HYNET_APP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HYNET_APP
-# endif
-# define machine_is_hynet_app()	(machine_arch_type == MACH_TYPE_HYNET_APP)
-#else
-# define machine_is_hynet_app()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MSM7200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MSM7200
-# endif
-# define machine_is_msm7200()	(machine_arch_type == MACH_TYPE_MSM7200)
-#else
-# define machine_is_msm7200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MSM7600
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MSM7600
-# endif
-# define machine_is_msm7600()	(machine_arch_type == MACH_TYPE_MSM7600)
-#else
-# define machine_is_msm7600()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CEB255
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CEB255
-# endif
-# define machine_is_ceb255()	(machine_arch_type == MACH_TYPE_CEB255)
-#else
-# define machine_is_ceb255()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CIEL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CIEL
-# endif
-# define machine_is_ciel()	(machine_arch_type == MACH_TYPE_CIEL)
-#else
-# define machine_is_ciel()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SLM5650
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SLM5650
-# endif
-# define machine_is_slm5650()	(machine_arch_type == MACH_TYPE_SLM5650)
-#else
-# define machine_is_slm5650()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM9RLEK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91SAM9RLEK
-# endif
-# define machine_is_at91sam9rlek()	(machine_arch_type == MACH_TYPE_AT91SAM9RLEK)
-#else
-# define machine_is_at91sam9rlek()	(0)
-#endif
-
-#ifdef CONFIG_MACH_COMTECH_ROUTER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_COMTECH_ROUTER
-# endif
-# define machine_is_comtech_router()	(machine_arch_type == MACH_TYPE_COMTECH_ROUTER)
-#else
-# define machine_is_comtech_router()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SBC2410X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SBC2410X
-# endif
-# define machine_is_sbc2410x()	(machine_arch_type == MACH_TYPE_SBC2410X)
-#else
-# define machine_is_sbc2410x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT4X0BD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT4X0BD
-# endif
-# define machine_is_at4x0bd()	(machine_arch_type == MACH_TYPE_AT4X0BD)
-#else
-# define machine_is_at4x0bd()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CBIFR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CBIFR
-# endif
-# define machine_is_cbifr()	(machine_arch_type == MACH_TYPE_CBIFR)
-#else
-# define machine_is_cbifr()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARCOM_QUANTUM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARCOM_QUANTUM
-# endif
-# define machine_is_arcom_quantum()	(machine_arch_type == MACH_TYPE_ARCOM_QUANTUM)
-#else
-# define machine_is_arcom_quantum()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MATRIX520
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MATRIX520
-# endif
-# define machine_is_matrix520()	(machine_arch_type == MACH_TYPE_MATRIX520)
-#else
-# define machine_is_matrix520()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MATRIX510
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MATRIX510
-# endif
-# define machine_is_matrix510()	(machine_arch_type == MACH_TYPE_MATRIX510)
-#else
-# define machine_is_matrix510()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MATRIX500
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MATRIX500
-# endif
-# define machine_is_matrix500()	(machine_arch_type == MACH_TYPE_MATRIX500)
-#else
-# define machine_is_matrix500()	(0)
-#endif
-
-#ifdef CONFIG_MACH_M501
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_M501
-# endif
-# define machine_is_m501()	(machine_arch_type == MACH_TYPE_M501)
-#else
-# define machine_is_m501()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AAEON1270
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AAEON1270
-# endif
-# define machine_is_aaeon1270()	(machine_arch_type == MACH_TYPE_AAEON1270)
-#else
-# define machine_is_aaeon1270()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MATRIX500EV
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MATRIX500EV
-# endif
-# define machine_is_matrix500ev()	(machine_arch_type == MACH_TYPE_MATRIX500EV)
-#else
-# define machine_is_matrix500ev()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PAC500
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PAC500
-# endif
-# define machine_is_pac500()	(machine_arch_type == MACH_TYPE_PAC500)
-#else
-# define machine_is_pac500()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PNX8181
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PNX8181
-# endif
-# define machine_is_pnx8181()	(machine_arch_type == MACH_TYPE_PNX8181)
-#else
-# define machine_is_pnx8181()	(0)
-#endif
-
-#ifdef CONFIG_MACH_COLIBRI320
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_COLIBRI320
-# endif
-# define machine_is_colibri320()	(machine_arch_type == MACH_TYPE_COLIBRI320)
-#else
-# define machine_is_colibri320()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AZTOOLBB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AZTOOLBB
-# endif
-# define machine_is_aztoolbb()	(machine_arch_type == MACH_TYPE_AZTOOLBB)
-#else
-# define machine_is_aztoolbb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AZTOOLG2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AZTOOLG2
-# endif
-# define machine_is_aztoolg2()	(machine_arch_type == MACH_TYPE_AZTOOLG2)
-#else
-# define machine_is_aztoolg2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DVLHOST
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DVLHOST
-# endif
-# define machine_is_dvlhost()	(machine_arch_type == MACH_TYPE_DVLHOST)
-#else
-# define machine_is_dvlhost()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZIR9200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZIR9200
-# endif
-# define machine_is_zir9200()	(machine_arch_type == MACH_TYPE_ZIR9200)
-#else
-# define machine_is_zir9200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZIR9260
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZIR9260
-# endif
-# define machine_is_zir9260()	(machine_arch_type == MACH_TYPE_ZIR9260)
-#else
-# define machine_is_zir9260()	(0)
-#endif
-
-#ifdef CONFIG_MACH_COCOPAH
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_COCOPAH
-# endif
-# define machine_is_cocopah()	(machine_arch_type == MACH_TYPE_COCOPAH)
-#else
-# define machine_is_cocopah()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NDS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NDS
-# endif
-# define machine_is_nds()	(machine_arch_type == MACH_TYPE_NDS)
-#else
-# define machine_is_nds()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ROSENCRANTZ
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ROSENCRANTZ
-# endif
-# define machine_is_rosencrantz()	(machine_arch_type == MACH_TYPE_ROSENCRANTZ)
-#else
-# define machine_is_rosencrantz()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FTTX_ODSC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FTTX_ODSC
-# endif
-# define machine_is_fttx_odsc()	(machine_arch_type == MACH_TYPE_FTTX_ODSC)
-#else
-# define machine_is_fttx_odsc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CLASSE_R6904
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CLASSE_R6904
-# endif
-# define machine_is_classe_r6904()	(machine_arch_type == MACH_TYPE_CLASSE_R6904)
-#else
-# define machine_is_classe_r6904()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CAM60
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CAM60
-# endif
-# define machine_is_cam60()	(machine_arch_type == MACH_TYPE_CAM60)
-#else
-# define machine_is_cam60()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MXC30031ADS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MXC30031ADS
-# endif
-# define machine_is_mxc30031ads()	(machine_arch_type == MACH_TYPE_MXC30031ADS)
-#else
-# define machine_is_mxc30031ads()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DATACALL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DATACALL
-# endif
-# define machine_is_datacall()	(machine_arch_type == MACH_TYPE_DATACALL)
-#else
-# define machine_is_datacall()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91EB01
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91EB01
-# endif
-# define machine_is_at91eb01()	(machine_arch_type == MACH_TYPE_AT91EB01)
-#else
-# define machine_is_at91eb01()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RTY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RTY
-# endif
-# define machine_is_rty()	(machine_arch_type == MACH_TYPE_RTY)
-#else
-# define machine_is_rty()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DWL2100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DWL2100
-# endif
-# define machine_is_dwl2100()	(machine_arch_type == MACH_TYPE_DWL2100)
-#else
-# define machine_is_dwl2100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VINSI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VINSI
-# endif
-# define machine_is_vinsi()	(machine_arch_type == MACH_TYPE_VINSI)
-#else
-# define machine_is_vinsi()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DB88F5281
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DB88F5281
-# endif
-# define machine_is_db88f5281()	(machine_arch_type == MACH_TYPE_DB88F5281)
-#else
-# define machine_is_db88f5281()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CSB726
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CSB726
-# endif
-# define machine_is_csb726()	(machine_arch_type == MACH_TYPE_CSB726)
-#else
-# define machine_is_csb726()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TIK27
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TIK27
-# endif
-# define machine_is_tik27()	(machine_arch_type == MACH_TYPE_TIK27)
-#else
-# define machine_is_tik27()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX_UC7420
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX_UC7420
-# endif
-# define machine_is_mx_uc7420()	(machine_arch_type == MACH_TYPE_MX_UC7420)
-#else
-# define machine_is_mx_uc7420()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RIRM3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RIRM3
-# endif
-# define machine_is_rirm3()	(machine_arch_type == MACH_TYPE_RIRM3)
-#else
-# define machine_is_rirm3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PELCO_ODYSSEY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PELCO_ODYSSEY
-# endif
-# define machine_is_pelco_odyssey()	(machine_arch_type == MACH_TYPE_PELCO_ODYSSEY)
-#else
-# define machine_is_pelco_odyssey()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ADX_ABOX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADX_ABOX
-# endif
-# define machine_is_adx_abox()	(machine_arch_type == MACH_TYPE_ADX_ABOX)
-#else
-# define machine_is_adx_abox()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ADX_TPID
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADX_TPID
-# endif
-# define machine_is_adx_tpid()	(machine_arch_type == MACH_TYPE_ADX_TPID)
-#else
-# define machine_is_adx_tpid()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MINICHECK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MINICHECK
-# endif
-# define machine_is_minicheck()	(machine_arch_type == MACH_TYPE_MINICHECK)
-#else
-# define machine_is_minicheck()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IDAM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IDAM
-# endif
-# define machine_is_idam()	(machine_arch_type == MACH_TYPE_IDAM)
-#else
-# define machine_is_idam()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MARIO_MX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MARIO_MX
-# endif
-# define machine_is_mario_mx()	(machine_arch_type == MACH_TYPE_MARIO_MX)
-#else
-# define machine_is_mario_mx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VI1888
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VI1888
-# endif
-# define machine_is_vi1888()	(machine_arch_type == MACH_TYPE_VI1888)
-#else
-# define machine_is_vi1888()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZR4230
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZR4230
-# endif
-# define machine_is_zr4230()	(machine_arch_type == MACH_TYPE_ZR4230)
-#else
-# define machine_is_zr4230()	(0)
-#endif
-
-#ifdef CONFIG_MACH_T1_IX_BLUE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_T1_IX_BLUE
-# endif
-# define machine_is_t1_ix_blue()	(machine_arch_type == MACH_TYPE_T1_IX_BLUE)
-#else
-# define machine_is_t1_ix_blue()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SYHQ2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SYHQ2
-# endif
-# define machine_is_syhq2()	(machine_arch_type == MACH_TYPE_SYHQ2)
-#else
-# define machine_is_syhq2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_COMPUTIME_R3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_COMPUTIME_R3
-# endif
-# define machine_is_computime_r3()	(machine_arch_type == MACH_TYPE_COMPUTIME_R3)
-#else
-# define machine_is_computime_r3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ORATIS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ORATIS
-# endif
-# define machine_is_oratis()	(machine_arch_type == MACH_TYPE_ORATIS)
-#else
-# define machine_is_oratis()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MIKKO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MIKKO
-# endif
-# define machine_is_mikko()	(machine_arch_type == MACH_TYPE_MIKKO)
-#else
-# define machine_is_mikko()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HOLON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HOLON
-# endif
-# define machine_is_holon()	(machine_arch_type == MACH_TYPE_HOLON)
-#else
-# define machine_is_holon()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OLIP8
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OLIP8
-# endif
-# define machine_is_olip8()	(machine_arch_type == MACH_TYPE_OLIP8)
-#else
-# define machine_is_olip8()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GHI270HG
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GHI270HG
-# endif
-# define machine_is_ghi270hg()	(machine_arch_type == MACH_TYPE_GHI270HG)
-#else
-# define machine_is_ghi270hg()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_DM6467_EVM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DAVINCI_DM6467_EVM
-# endif
-# define machine_is_davinci_dm6467_evm()	(machine_arch_type == MACH_TYPE_DAVINCI_DM6467_EVM)
-#else
-# define machine_is_davinci_dm6467_evm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_DM355_EVM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DAVINCI_DM355_EVM
-# endif
-# define machine_is_davinci_dm355_evm()	(machine_arch_type == MACH_TYPE_DAVINCI_DM355_EVM)
-#else
-# define machine_is_davinci_dm355_evm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BLACKRIVER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BLACKRIVER
-# endif
-# define machine_is_blackriver()	(machine_arch_type == MACH_TYPE_BLACKRIVER)
-#else
-# define machine_is_blackriver()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SANDGATEWP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SANDGATEWP
-# endif
-# define machine_is_sandgate_wp()	(machine_arch_type == MACH_TYPE_SANDGATEWP)
-#else
-# define machine_is_sandgate_wp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CDOTBWSG
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CDOTBWSG
-# endif
-# define machine_is_cdotbwsg()	(machine_arch_type == MACH_TYPE_CDOTBWSG)
-#else
-# define machine_is_cdotbwsg()	(0)
-#endif
-
-#ifdef CONFIG_MACH_QUARK963
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_QUARK963
-# endif
-# define machine_is_quark963()	(machine_arch_type == MACH_TYPE_QUARK963)
-#else
-# define machine_is_quark963()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CSB735
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CSB735
-# endif
-# define machine_is_csb735()	(machine_arch_type == MACH_TYPE_CSB735)
-#else
-# define machine_is_csb735()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LITTLETON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LITTLETON
-# endif
-# define machine_is_littleton()	(machine_arch_type == MACH_TYPE_LITTLETON)
-#else
-# define machine_is_littleton()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MIO_P550
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MIO_P550
-# endif
-# define machine_is_mio_p550()	(machine_arch_type == MACH_TYPE_MIO_P550)
-#else
-# define machine_is_mio_p550()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MOTION2440
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MOTION2440
-# endif
-# define machine_is_motion2440()	(machine_arch_type == MACH_TYPE_MOTION2440)
-#else
-# define machine_is_motion2440()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IMM500
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IMM500
-# endif
-# define machine_is_imm500()	(machine_arch_type == MACH_TYPE_IMM500)
-#else
-# define machine_is_imm500()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HOMEMATIC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HOMEMATIC
-# endif
-# define machine_is_homematic()	(machine_arch_type == MACH_TYPE_HOMEMATIC)
-#else
-# define machine_is_homematic()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ERMINE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ERMINE
-# endif
-# define machine_is_ermine()	(machine_arch_type == MACH_TYPE_ERMINE)
-#else
-# define machine_is_ermine()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KB9202B
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KB9202B
-# endif
-# define machine_is_kb9202b()	(machine_arch_type == MACH_TYPE_KB9202B)
-#else
-# define machine_is_kb9202b()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HS1XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HS1XX
-# endif
-# define machine_is_hs1xx()	(machine_arch_type == MACH_TYPE_HS1XX)
-#else
-# define machine_is_hs1xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_STUDENTMATE2440
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STUDENTMATE2440
-# endif
-# define machine_is_studentmate2440()	(machine_arch_type == MACH_TYPE_STUDENTMATE2440)
-#else
-# define machine_is_studentmate2440()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARVOO_L1_Z1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARVOO_L1_Z1
-# endif
-# define machine_is_arvoo_l1_z1()	(machine_arch_type == MACH_TYPE_ARVOO_L1_Z1)
-#else
-# define machine_is_arvoo_l1_z1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DEP2410K
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DEP2410K
-# endif
-# define machine_is_dep2410k()	(machine_arch_type == MACH_TYPE_DEP2410K)
-#else
-# define machine_is_dep2410k()	(0)
-#endif
-
-#ifdef CONFIG_MACH_XXSVIDEO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XXSVIDEO
-# endif
-# define machine_is_xxsvideo()	(machine_arch_type == MACH_TYPE_XXSVIDEO)
-#else
-# define machine_is_xxsvideo()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IM4004
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IM4004
-# endif
-# define machine_is_im4004()	(machine_arch_type == MACH_TYPE_IM4004)
-#else
-# define machine_is_im4004()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OCHAYA1050
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OCHAYA1050
-# endif
-# define machine_is_ochaya1050()	(machine_arch_type == MACH_TYPE_OCHAYA1050)
-#else
-# define machine_is_ochaya1050()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LEP9261
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LEP9261
-# endif
-# define machine_is_lep9261()	(machine_arch_type == MACH_TYPE_LEP9261)
-#else
-# define machine_is_lep9261()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SVENMEB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SVENMEB
-# endif
-# define machine_is_svenmeb()	(machine_arch_type == MACH_TYPE_SVENMEB)
-#else
-# define machine_is_svenmeb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FORTUNET2NE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FORTUNET2NE
-# endif
-# define machine_is_fortunet2ne()	(machine_arch_type == MACH_TYPE_FORTUNET2NE)
-#else
-# define machine_is_fortunet2ne()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NXHX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NXHX
-# endif
-# define machine_is_nxhx()	(machine_arch_type == MACH_TYPE_NXHX)
-#else
-# define machine_is_nxhx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_REALVIEW_PB11MP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_REALVIEW_PB11MP
-# endif
-# define machine_is_realview_pb11mp()	(machine_arch_type == MACH_TYPE_REALVIEW_PB11MP)
-#else
-# define machine_is_realview_pb11mp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IDS500
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IDS500
-# endif
-# define machine_is_ids500()	(machine_arch_type == MACH_TYPE_IDS500)
-#else
-# define machine_is_ids500()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ORS_N725
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ORS_N725
-# endif
-# define machine_is_ors_n725()	(machine_arch_type == MACH_TYPE_ORS_N725)
-#else
-# define machine_is_ors_n725()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HSDARM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HSDARM
-# endif
-# define machine_is_hsdarm()	(machine_arch_type == MACH_TYPE_HSDARM)
-#else
-# define machine_is_hsdarm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SHA_PON003
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SHA_PON003
-# endif
-# define machine_is_sha_pon003()	(machine_arch_type == MACH_TYPE_SHA_PON003)
-#else
-# define machine_is_sha_pon003()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SHA_PON004
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SHA_PON004
-# endif
-# define machine_is_sha_pon004()	(machine_arch_type == MACH_TYPE_SHA_PON004)
-#else
-# define machine_is_sha_pon004()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SHA_PON007
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SHA_PON007
-# endif
-# define machine_is_sha_pon007()	(machine_arch_type == MACH_TYPE_SHA_PON007)
-#else
-# define machine_is_sha_pon007()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SHA_PON011
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SHA_PON011
-# endif
-# define machine_is_sha_pon011()	(machine_arch_type == MACH_TYPE_SHA_PON011)
-#else
-# define machine_is_sha_pon011()	(0)
-#endif
-
-#ifdef CONFIG_MACH_H6042
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_H6042
-# endif
-# define machine_is_h6042()	(machine_arch_type == MACH_TYPE_H6042)
-#else
-# define machine_is_h6042()	(0)
-#endif
-
-#ifdef CONFIG_MACH_H6043
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_H6043
-# endif
-# define machine_is_h6043()	(machine_arch_type == MACH_TYPE_H6043)
-#else
-# define machine_is_h6043()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LOOXC550
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LOOXC550
-# endif
-# define machine_is_looxc550()	(machine_arch_type == MACH_TYPE_LOOXC550)
-#else
-# define machine_is_looxc550()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CNTY_TITAN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CNTY_TITAN
-# endif
-# define machine_is_cnty_titan()	(machine_arch_type == MACH_TYPE_CNTY_TITAN)
-#else
-# define machine_is_cnty_titan()	(0)
-#endif
-
-#ifdef CONFIG_MACH_APP3XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_APP3XX
-# endif
-# define machine_is_app3xx()	(machine_arch_type == MACH_TYPE_APP3XX)
-#else
-# define machine_is_app3xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SIDEOATSGRAMA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SIDEOATSGRAMA
-# endif
-# define machine_is_sideoatsgrama()	(machine_arch_type == MACH_TYPE_SIDEOATSGRAMA)
-#else
-# define machine_is_sideoatsgrama()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TREO700P
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TREO700P
-# endif
-# define machine_is_treo700p()	(machine_arch_type == MACH_TYPE_TREO700P)
-#else
-# define machine_is_treo700p()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TREO700W
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TREO700W
-# endif
-# define machine_is_treo700w()	(machine_arch_type == MACH_TYPE_TREO700W)
-#else
-# define machine_is_treo700w()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TREO750
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TREO750
-# endif
-# define machine_is_treo750()	(machine_arch_type == MACH_TYPE_TREO750)
-#else
-# define machine_is_treo750()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TREO755P
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TREO755P
-# endif
-# define machine_is_treo755p()	(machine_arch_type == MACH_TYPE_TREO755P)
-#else
-# define machine_is_treo755p()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EZREGANUT9200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EZREGANUT9200
-# endif
-# define machine_is_ezreganut9200()	(machine_arch_type == MACH_TYPE_EZREGANUT9200)
-#else
-# define machine_is_ezreganut9200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SARGE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SARGE
-# endif
-# define machine_is_sarge()	(machine_arch_type == MACH_TYPE_SARGE)
-#else
-# define machine_is_sarge()	(0)
-#endif
-
-#ifdef CONFIG_MACH_A696
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_A696
-# endif
-# define machine_is_a696()	(machine_arch_type == MACH_TYPE_A696)
-#else
-# define machine_is_a696()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TURTLE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TURTLE
-# endif
-# define machine_is_turtle1916()	(machine_arch_type == MACH_TYPE_TURTLE)
-#else
-# define machine_is_turtle1916()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX27_3DS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX27_3DS
-# endif
-# define machine_is_mx27_3ds()	(machine_arch_type == MACH_TYPE_MX27_3DS)
-#else
-# define machine_is_mx27_3ds()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BISHOP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BISHOP
-# endif
-# define machine_is_bishop()	(machine_arch_type == MACH_TYPE_BISHOP)
-#else
-# define machine_is_bishop()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PXX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PXX
-# endif
-# define machine_is_pxx()	(machine_arch_type == MACH_TYPE_PXX)
-#else
-# define machine_is_pxx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_REDWOOD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_REDWOOD
-# endif
-# define machine_is_redwood()	(machine_arch_type == MACH_TYPE_REDWOOD)
-#else
-# define machine_is_redwood()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_2430DLP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_2430DLP
-# endif
-# define machine_is_omap_2430dlp()	(machine_arch_type == MACH_TYPE_OMAP_2430DLP)
-#else
-# define machine_is_omap_2430dlp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_2430OSK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_2430OSK
-# endif
-# define machine_is_omap_2430osk()	(machine_arch_type == MACH_TYPE_OMAP_2430OSK)
-#else
-# define machine_is_omap_2430osk()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SARDINE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SARDINE
-# endif
-# define machine_is_sardine()	(machine_arch_type == MACH_TYPE_SARDINE)
-#else
-# define machine_is_sardine()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HALIBUT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HALIBUT
-# endif
-# define machine_is_halibut()	(machine_arch_type == MACH_TYPE_HALIBUT)
-#else
-# define machine_is_halibut()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TROUT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TROUT
-# endif
-# define machine_is_trout()	(machine_arch_type == MACH_TYPE_TROUT)
-#else
-# define machine_is_trout()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GOLDFISH
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GOLDFISH
-# endif
-# define machine_is_goldfish()	(machine_arch_type == MACH_TYPE_GOLDFISH)
-#else
-# define machine_is_goldfish()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GESBC2440
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GESBC2440
-# endif
-# define machine_is_gesbc2440()	(machine_arch_type == MACH_TYPE_GESBC2440)
-#else
-# define machine_is_gesbc2440()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NOMAD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NOMAD
-# endif
-# define machine_is_nomad()	(machine_arch_type == MACH_TYPE_NOMAD)
-#else
-# define machine_is_nomad()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ROSALIND
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ROSALIND
-# endif
-# define machine_is_rosalind()	(machine_arch_type == MACH_TYPE_ROSALIND)
-#else
-# define machine_is_rosalind()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CC9P9215
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CC9P9215
-# endif
-# define machine_is_cc9p9215()	(machine_arch_type == MACH_TYPE_CC9P9215)
-#else
-# define machine_is_cc9p9215()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CC9P9210
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CC9P9210
-# endif
-# define machine_is_cc9p9210()	(machine_arch_type == MACH_TYPE_CC9P9210)
-#else
-# define machine_is_cc9p9210()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CC9P9215JS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CC9P9215JS
-# endif
-# define machine_is_cc9p9215js()	(machine_arch_type == MACH_TYPE_CC9P9215JS)
-#else
-# define machine_is_cc9p9215js()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CC9P9210JS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CC9P9210JS
-# endif
-# define machine_is_cc9p9210js()	(machine_arch_type == MACH_TYPE_CC9P9210JS)
-#else
-# define machine_is_cc9p9210js()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NASFFE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NASFFE
-# endif
-# define machine_is_nasffe()	(machine_arch_type == MACH_TYPE_NASFFE)
-#else
-# define machine_is_nasffe()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TN2X0BD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TN2X0BD
-# endif
-# define machine_is_tn2x0bd()	(machine_arch_type == MACH_TYPE_TN2X0BD)
-#else
-# define machine_is_tn2x0bd()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GWMPXA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GWMPXA
-# endif
-# define machine_is_gwmpxa()	(machine_arch_type == MACH_TYPE_GWMPXA)
-#else
-# define machine_is_gwmpxa()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EXYPLUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EXYPLUS
-# endif
-# define machine_is_exyplus()	(machine_arch_type == MACH_TYPE_EXYPLUS)
-#else
-# define machine_is_exyplus()	(0)
-#endif
-
-#ifdef CONFIG_MACH_JADOO21
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_JADOO21
-# endif
-# define machine_is_jadoo21()	(machine_arch_type == MACH_TYPE_JADOO21)
-#else
-# define machine_is_jadoo21()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LOOXN560
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LOOXN560
-# endif
-# define machine_is_looxn560()	(machine_arch_type == MACH_TYPE_LOOXN560)
-#else
-# define machine_is_looxn560()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BONSAI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BONSAI
-# endif
-# define machine_is_bonsai()	(machine_arch_type == MACH_TYPE_BONSAI)
-#else
-# define machine_is_bonsai()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ADSMILGATO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADSMILGATO
-# endif
-# define machine_is_adsmilgato()	(machine_arch_type == MACH_TYPE_ADSMILGATO)
-#else
-# define machine_is_adsmilgato()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GBA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GBA
-# endif
-# define machine_is_gba()	(machine_arch_type == MACH_TYPE_GBA)
-#else
-# define machine_is_gba()	(0)
-#endif
-
-#ifdef CONFIG_MACH_H6044
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_H6044
-# endif
-# define machine_is_h6044()	(machine_arch_type == MACH_TYPE_H6044)
-#else
-# define machine_is_h6044()	(0)
-#endif
-
-#ifdef CONFIG_MACH_APP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_APP
-# endif
-# define machine_is_app()	(machine_arch_type == MACH_TYPE_APP)
-#else
-# define machine_is_app()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TCT_HAMMER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TCT_HAMMER
-# endif
-# define machine_is_tct_hammer()	(machine_arch_type == MACH_TYPE_TCT_HAMMER)
-#else
-# define machine_is_tct_hammer()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HERALD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HERALD
-# endif
-# define machine_is_herald()	(machine_arch_type == MACH_TYPE_HERALD)
-#else
-# define machine_is_herald()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARTEMIS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARTEMIS
-# endif
-# define machine_is_artemis()	(machine_arch_type == MACH_TYPE_ARTEMIS)
-#else
-# define machine_is_artemis()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCTITAN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCTITAN
-# endif
-# define machine_is_htctitan()	(machine_arch_type == MACH_TYPE_HTCTITAN)
-#else
-# define machine_is_htctitan()	(0)
-#endif
-
-#ifdef CONFIG_MACH_QRANIUM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_QRANIUM
-# endif
-# define machine_is_qranium()	(machine_arch_type == MACH_TYPE_QRANIUM)
-#else
-# define machine_is_qranium()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ADX_WSC2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADX_WSC2
-# endif
-# define machine_is_adx_wsc2()	(machine_arch_type == MACH_TYPE_ADX_WSC2)
-#else
-# define machine_is_adx_wsc2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ADX_MEDCOM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADX_MEDCOM
-# endif
-# define machine_is_adx_medcom()	(machine_arch_type == MACH_TYPE_ADX_MEDCOM)
-#else
-# define machine_is_adx_medcom()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BBOARD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BBOARD
-# endif
-# define machine_is_bboard()	(machine_arch_type == MACH_TYPE_BBOARD)
-#else
-# define machine_is_bboard()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CAMBRIA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CAMBRIA
-# endif
-# define machine_is_cambria()	(machine_arch_type == MACH_TYPE_CAMBRIA)
-#else
-# define machine_is_cambria()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MT7XXX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MT7XXX
-# endif
-# define machine_is_mt7xxx()	(machine_arch_type == MACH_TYPE_MT7XXX)
-#else
-# define machine_is_mt7xxx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MATRIX512
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MATRIX512
-# endif
-# define machine_is_matrix512()	(machine_arch_type == MACH_TYPE_MATRIX512)
-#else
-# define machine_is_matrix512()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MATRIX522
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MATRIX522
-# endif
-# define machine_is_matrix522()	(machine_arch_type == MACH_TYPE_MATRIX522)
-#else
-# define machine_is_matrix522()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IPAC5010
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IPAC5010
-# endif
-# define machine_is_ipac5010()	(machine_arch_type == MACH_TYPE_IPAC5010)
-#else
-# define machine_is_ipac5010()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SAKURA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SAKURA
-# endif
-# define machine_is_sakura()	(machine_arch_type == MACH_TYPE_SAKURA)
-#else
-# define machine_is_sakura()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GROCX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GROCX
-# endif
-# define machine_is_grocx()	(machine_arch_type == MACH_TYPE_GROCX)
-#else
-# define machine_is_grocx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PM9263
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PM9263
-# endif
-# define machine_is_pm9263()	(machine_arch_type == MACH_TYPE_PM9263)
-#else
-# define machine_is_pm9263()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SIM_ONE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SIM_ONE
-# endif
-# define machine_is_sim_one()	(machine_arch_type == MACH_TYPE_SIM_ONE)
-#else
-# define machine_is_sim_one()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ACQ132
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ACQ132
-# endif
-# define machine_is_acq132()	(machine_arch_type == MACH_TYPE_ACQ132)
-#else
-# define machine_is_acq132()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DATR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DATR
-# endif
-# define machine_is_datr()	(machine_arch_type == MACH_TYPE_DATR)
-#else
-# define machine_is_datr()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ACTUX1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ACTUX1
-# endif
-# define machine_is_actux1()	(machine_arch_type == MACH_TYPE_ACTUX1)
-#else
-# define machine_is_actux1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ACTUX2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ACTUX2
-# endif
-# define machine_is_actux2()	(machine_arch_type == MACH_TYPE_ACTUX2)
-#else
-# define machine_is_actux2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ACTUX3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ACTUX3
-# endif
-# define machine_is_actux3()	(machine_arch_type == MACH_TYPE_ACTUX3)
-#else
-# define machine_is_actux3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FLEXIT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FLEXIT
-# endif
-# define machine_is_flexit()	(machine_arch_type == MACH_TYPE_FLEXIT)
-#else
-# define machine_is_flexit()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BH2X0BD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BH2X0BD
-# endif
-# define machine_is_bh2x0bd()	(machine_arch_type == MACH_TYPE_BH2X0BD)
-#else
-# define machine_is_bh2x0bd()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ATB2002
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ATB2002
-# endif
-# define machine_is_atb2002()	(machine_arch_type == MACH_TYPE_ATB2002)
-#else
-# define machine_is_atb2002()	(0)
-#endif
-
-#ifdef CONFIG_MACH_XENON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XENON
-# endif
-# define machine_is_xenon()	(machine_arch_type == MACH_TYPE_XENON)
-#else
-# define machine_is_xenon()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FM607
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FM607
-# endif
-# define machine_is_fm607()	(machine_arch_type == MACH_TYPE_FM607)
-#else
-# define machine_is_fm607()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MATRIX514
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MATRIX514
-# endif
-# define machine_is_matrix514()	(machine_arch_type == MACH_TYPE_MATRIX514)
-#else
-# define machine_is_matrix514()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MATRIX524
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MATRIX524
-# endif
-# define machine_is_matrix524()	(machine_arch_type == MACH_TYPE_MATRIX524)
-#else
-# define machine_is_matrix524()	(0)
-#endif
-
-#ifdef CONFIG_MACH_INPOD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_INPOD
-# endif
-# define machine_is_inpod()	(machine_arch_type == MACH_TYPE_INPOD)
-#else
-# define machine_is_inpod()	(0)
-#endif
-
-#ifdef CONFIG_MACH_JIVE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_JIVE
-# endif
-# define machine_is_jive()	(machine_arch_type == MACH_TYPE_JIVE)
-#else
-# define machine_is_jive()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TLL_MX21
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TLL_MX21
-# endif
-# define machine_is_tll_mx21()	(machine_arch_type == MACH_TYPE_TLL_MX21)
-#else
-# define machine_is_tll_mx21()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SBC2800
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SBC2800
-# endif
-# define machine_is_sbc2800()	(machine_arch_type == MACH_TYPE_SBC2800)
-#else
-# define machine_is_sbc2800()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CC7UCAMRY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CC7UCAMRY
-# endif
-# define machine_is_cc7ucamry()	(machine_arch_type == MACH_TYPE_CC7UCAMRY)
-#else
-# define machine_is_cc7ucamry()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UBISYS_P9_SC15
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UBISYS_P9_SC15
-# endif
-# define machine_is_ubisys_p9_sc15()	(machine_arch_type == MACH_TYPE_UBISYS_P9_SC15)
-#else
-# define machine_is_ubisys_p9_sc15()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UBISYS_P9_SSC2D10
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UBISYS_P9_SSC2D10
-# endif
-# define machine_is_ubisys_p9_ssc2d10()	(machine_arch_type == MACH_TYPE_UBISYS_P9_SSC2D10)
-#else
-# define machine_is_ubisys_p9_ssc2d10()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UBISYS_P9_RCU3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UBISYS_P9_RCU3
-# endif
-# define machine_is_ubisys_p9_rcu3()	(machine_arch_type == MACH_TYPE_UBISYS_P9_RCU3)
-#else
-# define machine_is_ubisys_p9_rcu3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AML_M8000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AML_M8000
-# endif
-# define machine_is_aml_m8000()	(machine_arch_type == MACH_TYPE_AML_M8000)
-#else
-# define machine_is_aml_m8000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SNAPPER_270
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SNAPPER_270
-# endif
-# define machine_is_snapper_270()	(machine_arch_type == MACH_TYPE_SNAPPER_270)
-#else
-# define machine_is_snapper_270()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_BBX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_BBX
-# endif
-# define machine_is_omap_bbx()	(machine_arch_type == MACH_TYPE_OMAP_BBX)
-#else
-# define machine_is_omap_bbx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UCN2410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UCN2410
-# endif
-# define machine_is_ucn2410()	(machine_arch_type == MACH_TYPE_UCN2410)
-#else
-# define machine_is_ucn2410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SAM9_L9260
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SAM9_L9260
-# endif
-# define machine_is_sam9_l9260()	(machine_arch_type == MACH_TYPE_SAM9_L9260)
-#else
-# define machine_is_sam9_l9260()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ETI_C2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ETI_C2
-# endif
-# define machine_is_eti_c2()	(machine_arch_type == MACH_TYPE_ETI_C2)
-#else
-# define machine_is_eti_c2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AVALANCHE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AVALANCHE
-# endif
-# define machine_is_avalanche()	(machine_arch_type == MACH_TYPE_AVALANCHE)
-#else
-# define machine_is_avalanche()	(0)
-#endif
-
-#ifdef CONFIG_MACH_REALVIEW_PB1176
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_REALVIEW_PB1176
-# endif
-# define machine_is_realview_pb1176()	(machine_arch_type == MACH_TYPE_REALVIEW_PB1176)
-#else
-# define machine_is_realview_pb1176()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DP1500
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DP1500
-# endif
-# define machine_is_dp1500()	(machine_arch_type == MACH_TYPE_DP1500)
-#else
-# define machine_is_dp1500()	(0)
-#endif
-
-#ifdef CONFIG_MACH_APPLE_IPHONE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_APPLE_IPHONE
-# endif
-# define machine_is_apple_iphone()	(machine_arch_type == MACH_TYPE_APPLE_IPHONE)
-#else
-# define machine_is_apple_iphone()	(0)
-#endif
-
-#ifdef CONFIG_MACH_YL9200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_YL9200
-# endif
-# define machine_is_yl9200()	(machine_arch_type == MACH_TYPE_YL9200)
-#else
-# define machine_is_yl9200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RD88F5182
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RD88F5182
-# endif
-# define machine_is_rd88f5182()	(machine_arch_type == MACH_TYPE_RD88F5182)
-#else
-# define machine_is_rd88f5182()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KUROBOX_PRO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KUROBOX_PRO
-# endif
-# define machine_is_kurobox_pro()	(machine_arch_type == MACH_TYPE_KUROBOX_PRO)
-#else
-# define machine_is_kurobox_pro()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SE_POET
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SE_POET
-# endif
-# define machine_is_se_poet()	(machine_arch_type == MACH_TYPE_SE_POET)
-#else
-# define machine_is_se_poet()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX31_3DS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX31_3DS
-# endif
-# define machine_is_mx31_3ds()	(machine_arch_type == MACH_TYPE_MX31_3DS)
-#else
-# define machine_is_mx31_3ds()	(0)
-#endif
-
-#ifdef CONFIG_MACH_R270
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_R270
-# endif
-# define machine_is_r270()	(machine_arch_type == MACH_TYPE_R270)
-#else
-# define machine_is_r270()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARMOUR21
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARMOUR21
-# endif
-# define machine_is_armour21()	(machine_arch_type == MACH_TYPE_ARMOUR21)
-#else
-# define machine_is_armour21()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DT2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DT2
-# endif
-# define machine_is_dt2()	(machine_arch_type == MACH_TYPE_DT2)
-#else
-# define machine_is_dt2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VT4
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VT4
-# endif
-# define machine_is_vt4()	(machine_arch_type == MACH_TYPE_VT4)
-#else
-# define machine_is_vt4()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TYCO320
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TYCO320
-# endif
-# define machine_is_tyco320()	(machine_arch_type == MACH_TYPE_TYCO320)
-#else
-# define machine_is_tyco320()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ADMA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADMA
-# endif
-# define machine_is_adma()	(machine_arch_type == MACH_TYPE_ADMA)
-#else
-# define machine_is_adma()	(0)
-#endif
-
-#ifdef CONFIG_MACH_WP188
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WP188
-# endif
-# define machine_is_wp188()	(machine_arch_type == MACH_TYPE_WP188)
-#else
-# define machine_is_wp188()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CORSICA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CORSICA
-# endif
-# define machine_is_corsica()	(machine_arch_type == MACH_TYPE_CORSICA)
-#else
-# define machine_is_corsica()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BIGEYE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BIGEYE
-# endif
-# define machine_is_bigeye()	(machine_arch_type == MACH_TYPE_BIGEYE)
-#else
-# define machine_is_bigeye()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TLL5000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TLL5000
-# endif
-# define machine_is_tll5000()	(machine_arch_type == MACH_TYPE_TLL5000)
-#else
-# define machine_is_tll5000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BEBOT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BEBOT
-# endif
-# define machine_is_bebot()	(machine_arch_type == MACH_TYPE_BEBOT)
-#else
-# define machine_is_bebot()	(0)
-#endif
-
-#ifdef CONFIG_MACH_QONG
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_QONG
-# endif
-# define machine_is_qong()	(machine_arch_type == MACH_TYPE_QONG)
-#else
-# define machine_is_qong()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TCOMPACT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TCOMPACT
-# endif
-# define machine_is_tcompact()	(machine_arch_type == MACH_TYPE_TCOMPACT)
-#else
-# define machine_is_tcompact()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PUMA5
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PUMA5
-# endif
-# define machine_is_puma5()	(machine_arch_type == MACH_TYPE_PUMA5)
-#else
-# define machine_is_puma5()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ELARA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ELARA
-# endif
-# define machine_is_elara()	(machine_arch_type == MACH_TYPE_ELARA)
-#else
-# define machine_is_elara()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ELLINGTON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ELLINGTON
-# endif
-# define machine_is_ellington()	(machine_arch_type == MACH_TYPE_ELLINGTON)
-#else
-# define machine_is_ellington()	(0)
-#endif
-
-#ifdef CONFIG_MACH_XDA_ATOM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XDA_ATOM
-# endif
-# define machine_is_xda_atom()	(machine_arch_type == MACH_TYPE_XDA_ATOM)
-#else
-# define machine_is_xda_atom()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ENERGIZER2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ENERGIZER2
-# endif
-# define machine_is_energizer2()	(machine_arch_type == MACH_TYPE_ENERGIZER2)
-#else
-# define machine_is_energizer2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ODIN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ODIN
-# endif
-# define machine_is_odin()	(machine_arch_type == MACH_TYPE_ODIN)
-#else
-# define machine_is_odin()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ACTUX4
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ACTUX4
-# endif
-# define machine_is_actux4()	(machine_arch_type == MACH_TYPE_ACTUX4)
-#else
-# define machine_is_actux4()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ESL_OMAP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ESL_OMAP
-# endif
-# define machine_is_esl_omap()	(machine_arch_type == MACH_TYPE_ESL_OMAP)
-#else
-# define machine_is_esl_omap()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP2EVM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP2EVM
-# endif
-# define machine_is_omap2evm()	(machine_arch_type == MACH_TYPE_OMAP2EVM)
-#else
-# define machine_is_omap2evm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3EVM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP3EVM
-# endif
-# define machine_is_omap3evm()	(machine_arch_type == MACH_TYPE_OMAP3EVM)
-#else
-# define machine_is_omap3evm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ADX_PCU57
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADX_PCU57
-# endif
-# define machine_is_adx_pcu57()	(machine_arch_type == MACH_TYPE_ADX_PCU57)
-#else
-# define machine_is_adx_pcu57()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MONACO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MONACO
-# endif
-# define machine_is_monaco()	(machine_arch_type == MACH_TYPE_MONACO)
-#else
-# define machine_is_monaco()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LEVANTE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LEVANTE
-# endif
-# define machine_is_levante()	(machine_arch_type == MACH_TYPE_LEVANTE)
-#else
-# define machine_is_levante()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TMXIPX425
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TMXIPX425
-# endif
-# define machine_is_tmxipx425()	(machine_arch_type == MACH_TYPE_TMXIPX425)
-#else
-# define machine_is_tmxipx425()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LEEP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LEEP
-# endif
-# define machine_is_leep()	(machine_arch_type == MACH_TYPE_LEEP)
-#else
-# define machine_is_leep()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RAAD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RAAD
-# endif
-# define machine_is_raad()	(machine_arch_type == MACH_TYPE_RAAD)
-#else
-# define machine_is_raad()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DNS323
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DNS323
-# endif
-# define machine_is_dns323()	(machine_arch_type == MACH_TYPE_DNS323)
-#else
-# define machine_is_dns323()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AP1000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AP1000
-# endif
-# define machine_is_ap1000()	(machine_arch_type == MACH_TYPE_AP1000)
-#else
-# define machine_is_ap1000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_A9SAM6432
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_A9SAM6432
-# endif
-# define machine_is_a9sam6432()	(machine_arch_type == MACH_TYPE_A9SAM6432)
-#else
-# define machine_is_a9sam6432()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SHINY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SHINY
-# endif
-# define machine_is_shiny()	(machine_arch_type == MACH_TYPE_SHINY)
-#else
-# define machine_is_shiny()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_BEAGLE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP3_BEAGLE
-# endif
-# define machine_is_omap3_beagle()	(machine_arch_type == MACH_TYPE_OMAP3_BEAGLE)
-#else
-# define machine_is_omap3_beagle()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CSR_BDB2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CSR_BDB2
-# endif
-# define machine_is_csr_bdb2()	(machine_arch_type == MACH_TYPE_CSR_BDB2)
-#else
-# define machine_is_csr_bdb2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NOKIA_N810
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NOKIA_N810
-# endif
-# define machine_is_nokia_n810()	(machine_arch_type == MACH_TYPE_NOKIA_N810)
-#else
-# define machine_is_nokia_n810()	(0)
-#endif
-
-#ifdef CONFIG_MACH_C270
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_C270
-# endif
-# define machine_is_c270()	(machine_arch_type == MACH_TYPE_C270)
-#else
-# define machine_is_c270()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SENTRY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SENTRY
-# endif
-# define machine_is_sentry()	(machine_arch_type == MACH_TYPE_SENTRY)
-#else
-# define machine_is_sentry()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PCM038
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PCM038
-# endif
-# define machine_is_pcm038()	(machine_arch_type == MACH_TYPE_PCM038)
-#else
-# define machine_is_pcm038()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ANC300
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ANC300
-# endif
-# define machine_is_anc300()	(machine_arch_type == MACH_TYPE_ANC300)
-#else
-# define machine_is_anc300()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCKAISER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCKAISER
-# endif
-# define machine_is_htckaiser()	(machine_arch_type == MACH_TYPE_HTCKAISER)
-#else
-# define machine_is_htckaiser()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SBAT100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SBAT100
-# endif
-# define machine_is_sbat100()	(machine_arch_type == MACH_TYPE_SBAT100)
-#else
-# define machine_is_sbat100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MODUNORM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MODUNORM
-# endif
-# define machine_is_modunorm()	(machine_arch_type == MACH_TYPE_MODUNORM)
-#else
-# define machine_is_modunorm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PELOS_TWARM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PELOS_TWARM
-# endif
-# define machine_is_pelos_twarm()	(machine_arch_type == MACH_TYPE_PELOS_TWARM)
-#else
-# define machine_is_pelos_twarm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FLANK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FLANK
-# endif
-# define machine_is_flank()	(machine_arch_type == MACH_TYPE_FLANK)
-#else
-# define machine_is_flank()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SIRLOIN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SIRLOIN
-# endif
-# define machine_is_sirloin()	(machine_arch_type == MACH_TYPE_SIRLOIN)
-#else
-# define machine_is_sirloin()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BRISKET
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BRISKET
-# endif
-# define machine_is_brisket()	(machine_arch_type == MACH_TYPE_BRISKET)
-#else
-# define machine_is_brisket()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CHUCK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CHUCK
-# endif
-# define machine_is_chuck()	(machine_arch_type == MACH_TYPE_CHUCK)
-#else
-# define machine_is_chuck()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OTTER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OTTER
-# endif
-# define machine_is_otter()	(machine_arch_type == MACH_TYPE_OTTER)
-#else
-# define machine_is_otter()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_LDK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DAVINCI_LDK
-# endif
-# define machine_is_davinci_ldk()	(machine_arch_type == MACH_TYPE_DAVINCI_LDK)
-#else
-# define machine_is_davinci_ldk()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PHREEDOM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PHREEDOM
-# endif
-# define machine_is_phreedom()	(machine_arch_type == MACH_TYPE_PHREEDOM)
-#else
-# define machine_is_phreedom()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SG310
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SG310
-# endif
-# define machine_is_sg310()	(machine_arch_type == MACH_TYPE_SG310)
-#else
-# define machine_is_sg310()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TS209
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TS209
-# endif
-# define machine_is_ts_x09()	(machine_arch_type == MACH_TYPE_TS209)
-#else
-# define machine_is_ts_x09()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91CAP9ADK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91CAP9ADK
-# endif
-# define machine_is_at91cap9adk()	(machine_arch_type == MACH_TYPE_AT91CAP9ADK)
-#else
-# define machine_is_at91cap9adk()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TION9315
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TION9315
-# endif
-# define machine_is_tion9315()	(machine_arch_type == MACH_TYPE_TION9315)
-#else
-# define machine_is_tion9315()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MAST
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MAST
-# endif
-# define machine_is_mast()	(machine_arch_type == MACH_TYPE_MAST)
-#else
-# define machine_is_mast()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PFW
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PFW
-# endif
-# define machine_is_pfw()	(machine_arch_type == MACH_TYPE_PFW)
-#else
-# define machine_is_pfw()	(0)
-#endif
-
-#ifdef CONFIG_MACH_YL_P2440
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_YL_P2440
-# endif
-# define machine_is_yl_p2440()	(machine_arch_type == MACH_TYPE_YL_P2440)
-#else
-# define machine_is_yl_p2440()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZSBC32
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZSBC32
-# endif
-# define machine_is_zsbc32()	(machine_arch_type == MACH_TYPE_ZSBC32)
-#else
-# define machine_is_zsbc32()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_PACE2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_PACE2
-# endif
-# define machine_is_omap_pace2()	(machine_arch_type == MACH_TYPE_OMAP_PACE2)
-#else
-# define machine_is_omap_pace2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IMX_PACE2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IMX_PACE2
-# endif
-# define machine_is_imx_pace2()	(machine_arch_type == MACH_TYPE_IMX_PACE2)
-#else
-# define machine_is_imx_pace2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX31MOBOARD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX31MOBOARD
-# endif
-# define machine_is_mx31moboard()	(machine_arch_type == MACH_TYPE_MX31MOBOARD)
-#else
-# define machine_is_mx31moboard()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX37_3DS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX37_3DS
-# endif
-# define machine_is_mx37_3ds()	(machine_arch_type == MACH_TYPE_MX37_3DS)
-#else
-# define machine_is_mx37_3ds()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RCC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RCC
-# endif
-# define machine_is_rcc()	(machine_arch_type == MACH_TYPE_RCC)
-#else
-# define machine_is_rcc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARM9
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARM9
-# endif
-# define machine_is_dmp()	(machine_arch_type == MACH_TYPE_ARM9)
-#else
-# define machine_is_dmp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VISION_EP9307
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VISION_EP9307
-# endif
-# define machine_is_vision_ep9307()	(machine_arch_type == MACH_TYPE_VISION_EP9307)
-#else
-# define machine_is_vision_ep9307()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SCLY1000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SCLY1000
-# endif
-# define machine_is_scly1000()	(machine_arch_type == MACH_TYPE_SCLY1000)
-#else
-# define machine_is_scly1000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FONTEL_EP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FONTEL_EP
-# endif
-# define machine_is_fontel_ep()	(machine_arch_type == MACH_TYPE_FONTEL_EP)
-#else
-# define machine_is_fontel_ep()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VOICEBLUE3G
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VOICEBLUE3G
-# endif
-# define machine_is_voiceblue3g()	(machine_arch_type == MACH_TYPE_VOICEBLUE3G)
-#else
-# define machine_is_voiceblue3g()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TT9200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TT9200
-# endif
-# define machine_is_tt9200()	(machine_arch_type == MACH_TYPE_TT9200)
-#else
-# define machine_is_tt9200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DIGI2410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DIGI2410
-# endif
-# define machine_is_digi2410()	(machine_arch_type == MACH_TYPE_DIGI2410)
-#else
-# define machine_is_digi2410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TERASTATION_PRO2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TERASTATION_PRO2
-# endif
-# define machine_is_terastation_pro2()	(machine_arch_type == MACH_TYPE_TERASTATION_PRO2)
-#else
-# define machine_is_terastation_pro2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LINKSTATION_PRO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LINKSTATION_PRO
-# endif
-# define machine_is_linkstation_pro()	(machine_arch_type == MACH_TYPE_LINKSTATION_PRO)
-#else
-# define machine_is_linkstation_pro()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MOTOROLA_A780
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MOTOROLA_A780
-# endif
-# define machine_is_motorola_a780()	(machine_arch_type == MACH_TYPE_MOTOROLA_A780)
-#else
-# define machine_is_motorola_a780()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MOTOROLA_E6
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MOTOROLA_E6
-# endif
-# define machine_is_motorola_e6()	(machine_arch_type == MACH_TYPE_MOTOROLA_E6)
-#else
-# define machine_is_motorola_e6()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MOTOROLA_E2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MOTOROLA_E2
-# endif
-# define machine_is_motorola_e2()	(machine_arch_type == MACH_TYPE_MOTOROLA_E2)
-#else
-# define machine_is_motorola_e2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MOTOROLA_E680
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MOTOROLA_E680
-# endif
-# define machine_is_motorola_e680()	(machine_arch_type == MACH_TYPE_MOTOROLA_E680)
-#else
-# define machine_is_motorola_e680()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UR2410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UR2410
-# endif
-# define machine_is_ur2410()	(machine_arch_type == MACH_TYPE_UR2410)
-#else
-# define machine_is_ur2410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TAS9261
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TAS9261
-# endif
-# define machine_is_tas9261()	(machine_arch_type == MACH_TYPE_TAS9261)
-#else
-# define machine_is_tas9261()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HERMES_HD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HERMES_HD
-# endif
-# define machine_is_davinci_hermes_hd()	(machine_arch_type == MACH_TYPE_HERMES_HD)
-#else
-# define machine_is_davinci_hermes_hd()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PERSEO_HD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PERSEO_HD
-# endif
-# define machine_is_davinci_perseo_hd()	(machine_arch_type == MACH_TYPE_PERSEO_HD)
-#else
-# define machine_is_davinci_perseo_hd()	(0)
-#endif
-
-#ifdef CONFIG_MACH_STARGAZER2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STARGAZER2
-# endif
-# define machine_is_stargazer2()	(machine_arch_type == MACH_TYPE_STARGAZER2)
-#else
-# define machine_is_stargazer2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_E350
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_E350
-# endif
-# define machine_is_e350()	(machine_arch_type == MACH_TYPE_E350)
-#else
-# define machine_is_e350()	(0)
-#endif
-
-#ifdef CONFIG_MACH_WPCM450
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WPCM450
-# endif
-# define machine_is_wpcm450()	(machine_arch_type == MACH_TYPE_WPCM450)
-#else
-# define machine_is_wpcm450()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CARTESIO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CARTESIO
-# endif
-# define machine_is_cartesio()	(machine_arch_type == MACH_TYPE_CARTESIO)
-#else
-# define machine_is_cartesio()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TOYBOX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TOYBOX
-# endif
-# define machine_is_toybox()	(machine_arch_type == MACH_TYPE_TOYBOX)
-#else
-# define machine_is_toybox()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TX27
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TX27
-# endif
-# define machine_is_tx27()	(machine_arch_type == MACH_TYPE_TX27)
-#else
-# define machine_is_tx27()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TS409
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TS409
-# endif
-# define machine_is_ts409()	(machine_arch_type == MACH_TYPE_TS409)
-#else
-# define machine_is_ts409()	(0)
-#endif
-
-#ifdef CONFIG_MACH_P300
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_P300
-# endif
-# define machine_is_p300()	(machine_arch_type == MACH_TYPE_P300)
-#else
-# define machine_is_p300()	(0)
-#endif
-
-#ifdef CONFIG_MACH_XDACOMET
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XDACOMET
-# endif
-# define machine_is_xdacomet()	(machine_arch_type == MACH_TYPE_XDACOMET)
-#else
-# define machine_is_xdacomet()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DEXFLEX2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DEXFLEX2
-# endif
-# define machine_is_dexflex2()	(machine_arch_type == MACH_TYPE_DEXFLEX2)
-#else
-# define machine_is_dexflex2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OW
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OW
-# endif
-# define machine_is_ow()	(machine_arch_type == MACH_TYPE_OW)
-#else
-# define machine_is_ow()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARMEBS3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARMEBS3
-# endif
-# define machine_is_armebs3()	(machine_arch_type == MACH_TYPE_ARMEBS3)
-#else
-# define machine_is_armebs3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_U3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_U3
-# endif
-# define machine_is_u3()	(machine_arch_type == MACH_TYPE_U3)
-#else
-# define machine_is_u3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK2450
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMDK2450
-# endif
-# define machine_is_smdk2450()	(machine_arch_type == MACH_TYPE_SMDK2450)
-#else
-# define machine_is_smdk2450()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RSI_EWS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RSI_EWS
-# endif
-# define machine_is_rsi_ews()	(machine_arch_type == MACH_TYPE_RSI_EWS)
-#else
-# define machine_is_rsi_ews()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TNB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TNB
-# endif
-# define machine_is_tnb()	(machine_arch_type == MACH_TYPE_TNB)
-#else
-# define machine_is_tnb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TOEPATH
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TOEPATH
-# endif
-# define machine_is_toepath()	(machine_arch_type == MACH_TYPE_TOEPATH)
-#else
-# define machine_is_toepath()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KB9263
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KB9263
-# endif
-# define machine_is_kb9263()	(machine_arch_type == MACH_TYPE_KB9263)
-#else
-# define machine_is_kb9263()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MT7108
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MT7108
-# endif
-# define machine_is_mt7108()	(machine_arch_type == MACH_TYPE_MT7108)
-#else
-# define machine_is_mt7108()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SMTR2440
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMTR2440
-# endif
-# define machine_is_smtr2440()	(machine_arch_type == MACH_TYPE_SMTR2440)
-#else
-# define machine_is_smtr2440()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MANAO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MANAO
-# endif
-# define machine_is_manao()	(machine_arch_type == MACH_TYPE_MANAO)
-#else
-# define machine_is_manao()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CM_X300
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CM_X300
-# endif
-# define machine_is_cm_x300()	(machine_arch_type == MACH_TYPE_CM_X300)
-#else
-# define machine_is_cm_x300()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GULFSTREAM_KP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GULFSTREAM_KP
-# endif
-# define machine_is_gulfstream_kp()	(machine_arch_type == MACH_TYPE_GULFSTREAM_KP)
-#else
-# define machine_is_gulfstream_kp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LANREADYFN522
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LANREADYFN522
-# endif
-# define machine_is_lanreadyfn522()	(machine_arch_type == MACH_TYPE_LANREADYFN522)
-#else
-# define machine_is_lanreadyfn522()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARMA37
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARMA37
-# endif
-# define machine_is_arma37()	(machine_arch_type == MACH_TYPE_ARMA37)
-#else
-# define machine_is_arma37()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MENDEL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MENDEL
-# endif
-# define machine_is_mendel()	(machine_arch_type == MACH_TYPE_MENDEL)
-#else
-# define machine_is_mendel()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PELCO_ILIAD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PELCO_ILIAD
-# endif
-# define machine_is_pelco_iliad()	(machine_arch_type == MACH_TYPE_PELCO_ILIAD)
-#else
-# define machine_is_pelco_iliad()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UNIT2P
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UNIT2P
-# endif
-# define machine_is_unit2p()	(machine_arch_type == MACH_TYPE_UNIT2P)
-#else
-# define machine_is_unit2p()	(0)
-#endif
-
-#ifdef CONFIG_MACH_INC20OTTER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_INC20OTTER
-# endif
-# define machine_is_inc20otter()	(machine_arch_type == MACH_TYPE_INC20OTTER)
-#else
-# define machine_is_inc20otter()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM9G20EK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91SAM9G20EK
-# endif
-# define machine_is_at91sam9g20ek()	(machine_arch_type == MACH_TYPE_AT91SAM9G20EK)
-#else
-# define machine_is_at91sam9g20ek()	(0)
-#endif
-
-#ifdef CONFIG_MACH_STORCENTER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STORCENTER
-# endif
-# define machine_is_sc_ge2()	(machine_arch_type == MACH_TYPE_STORCENTER)
-#else
-# define machine_is_sc_ge2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK6410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMDK6410
-# endif
-# define machine_is_smdk6410()	(machine_arch_type == MACH_TYPE_SMDK6410)
-#else
-# define machine_is_smdk6410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_U300
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_U300
-# endif
-# define machine_is_u300()	(machine_arch_type == MACH_TYPE_U300)
-#else
-# define machine_is_u300()	(0)
-#endif
-
-#ifdef CONFIG_MACH_U500
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_U500
-# endif
-# define machine_is_u500()	(machine_arch_type == MACH_TYPE_U500)
-#else
-# define machine_is_u500()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DS9260
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DS9260
-# endif
-# define machine_is_ds9260()	(machine_arch_type == MACH_TYPE_DS9260)
-#else
-# define machine_is_ds9260()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RIVERROCK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RIVERROCK
-# endif
-# define machine_is_riverrock()	(machine_arch_type == MACH_TYPE_RIVERROCK)
-#else
-# define machine_is_riverrock()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SCIBATH
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SCIBATH
-# endif
-# define machine_is_scibath()	(machine_arch_type == MACH_TYPE_SCIBATH)
-#else
-# define machine_is_scibath()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM7SE512EK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91SAM7SE512EK
-# endif
-# define machine_is_at91sam7se()	(machine_arch_type == MACH_TYPE_AT91SAM7SE512EK)
-#else
-# define machine_is_at91sam7se()	(0)
-#endif
-
-#ifdef CONFIG_MACH_WRT350N_V2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WRT350N_V2
-# endif
-# define machine_is_wrt350n_v2()	(machine_arch_type == MACH_TYPE_WRT350N_V2)
-#else
-# define machine_is_wrt350n_v2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MULTIMEDIA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MULTIMEDIA
-# endif
-# define machine_is_multimedia()	(machine_arch_type == MACH_TYPE_MULTIMEDIA)
-#else
-# define machine_is_multimedia()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MARVIN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MARVIN
-# endif
-# define machine_is_marvin()	(machine_arch_type == MACH_TYPE_MARVIN)
-#else
-# define machine_is_marvin()	(0)
-#endif
-
-#ifdef CONFIG_MACH_X500
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_X500
-# endif
-# define machine_is_x500()	(machine_arch_type == MACH_TYPE_X500)
-#else
-# define machine_is_x500()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AWLUG4LCU
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AWLUG4LCU
-# endif
-# define machine_is_awlug4lcu()	(machine_arch_type == MACH_TYPE_AWLUG4LCU)
-#else
-# define machine_is_awlug4lcu()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PALERMOC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PALERMOC
-# endif
-# define machine_is_palermoc()	(machine_arch_type == MACH_TYPE_PALERMOC)
-#else
-# define machine_is_palermoc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_LDP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_LDP
-# endif
-# define machine_is_omap_ldp()	(machine_arch_type == MACH_TYPE_OMAP_LDP)
-#else
-# define machine_is_omap_ldp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IP500
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IP500
-# endif
-# define machine_is_ip500()	(machine_arch_type == MACH_TYPE_IP500)
-#else
-# define machine_is_ip500()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ASE2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ASE2
-# endif
-# define machine_is_ase2()	(machine_arch_type == MACH_TYPE_ASE2)
-#else
-# define machine_is_ase2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX35EVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX35EVB
-# endif
-# define machine_is_mx35evb()	(machine_arch_type == MACH_TYPE_MX35EVB)
-#else
-# define machine_is_mx35evb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AML_M8050
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AML_M8050
-# endif
-# define machine_is_aml_m8050()	(machine_arch_type == MACH_TYPE_AML_M8050)
-#else
-# define machine_is_aml_m8050()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX35_3DS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX35_3DS
-# endif
-# define machine_is_mx35_3ds()	(machine_arch_type == MACH_TYPE_MX35_3DS)
-#else
-# define machine_is_mx35_3ds()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MARS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MARS
-# endif
-# define machine_is_mars()	(machine_arch_type == MACH_TYPE_MARS)
-#else
-# define machine_is_mars()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NEUROS_OSD2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NEUROS_OSD2
-# endif
-# define machine_is_neuros_osd2()	(machine_arch_type == MACH_TYPE_NEUROS_OSD2)
-#else
-# define machine_is_neuros_osd2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BADGER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BADGER
-# endif
-# define machine_is_badger()	(machine_arch_type == MACH_TYPE_BADGER)
-#else
-# define machine_is_badger()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TRIZEPS4WL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TRIZEPS4WL
-# endif
-# define machine_is_trizeps4wl()	(machine_arch_type == MACH_TYPE_TRIZEPS4WL)
-#else
-# define machine_is_trizeps4wl()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TRIZEPS5
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TRIZEPS5
-# endif
-# define machine_is_trizeps5()	(machine_arch_type == MACH_TYPE_TRIZEPS5)
-#else
-# define machine_is_trizeps5()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MARLIN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MARLIN
-# endif
-# define machine_is_marlin()	(machine_arch_type == MACH_TYPE_MARLIN)
-#else
-# define machine_is_marlin()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TS78XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TS78XX
-# endif
-# define machine_is_ts78xx()	(machine_arch_type == MACH_TYPE_TS78XX)
-#else
-# define machine_is_ts78xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HPIPAQ214
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HPIPAQ214
-# endif
-# define machine_is_hpipaq214()	(machine_arch_type == MACH_TYPE_HPIPAQ214)
-#else
-# define machine_is_hpipaq214()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT572D940DCM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT572D940DCM
-# endif
-# define machine_is_at572d940dcm()	(machine_arch_type == MACH_TYPE_AT572D940DCM)
-#else
-# define machine_is_at572d940dcm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NE1BOARD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NE1BOARD
-# endif
-# define machine_is_ne1board()	(machine_arch_type == MACH_TYPE_NE1BOARD)
-#else
-# define machine_is_ne1board()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZANTE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZANTE
-# endif
-# define machine_is_zante()	(machine_arch_type == MACH_TYPE_ZANTE)
-#else
-# define machine_is_zante()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SFFSDR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SFFSDR
-# endif
-# define machine_is_sffsdr()	(machine_arch_type == MACH_TYPE_SFFSDR)
-#else
-# define machine_is_sffsdr()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TW2662
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TW2662
-# endif
-# define machine_is_tw2662()	(machine_arch_type == MACH_TYPE_TW2662)
-#else
-# define machine_is_tw2662()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VF10XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VF10XX
-# endif
-# define machine_is_vf10xx()	(machine_arch_type == MACH_TYPE_VF10XX)
-#else
-# define machine_is_vf10xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZORAN43XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZORAN43XX
-# endif
-# define machine_is_zoran43xx()	(machine_arch_type == MACH_TYPE_ZORAN43XX)
-#else
-# define machine_is_zoran43xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SONIX926
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SONIX926
-# endif
-# define machine_is_sonix926()	(machine_arch_type == MACH_TYPE_SONIX926)
-#else
-# define machine_is_sonix926()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CELESTIALSEMI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CELESTIALSEMI
-# endif
-# define machine_is_celestialsemi()	(machine_arch_type == MACH_TYPE_CELESTIALSEMI)
-#else
-# define machine_is_celestialsemi()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CC9M2443JS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CC9M2443JS
-# endif
-# define machine_is_cc9m2443js()	(machine_arch_type == MACH_TYPE_CC9M2443JS)
-#else
-# define machine_is_cc9m2443js()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TW5334
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TW5334
-# endif
-# define machine_is_tw5334()	(machine_arch_type == MACH_TYPE_TW5334)
-#else
-# define machine_is_tw5334()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCARTEMIS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCARTEMIS
-# endif
-# define machine_is_omap_htcartemis()	(machine_arch_type == MACH_TYPE_HTCARTEMIS)
-#else
-# define machine_is_omap_htcartemis()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NAL_HLITE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NAL_HLITE
-# endif
-# define machine_is_nal_hlite()	(machine_arch_type == MACH_TYPE_NAL_HLITE)
-#else
-# define machine_is_nal_hlite()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCVOGUE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCVOGUE
-# endif
-# define machine_is_htcvogue()	(machine_arch_type == MACH_TYPE_HTCVOGUE)
-#else
-# define machine_is_htcvogue()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SMARTWEB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMARTWEB
-# endif
-# define machine_is_smartweb()	(machine_arch_type == MACH_TYPE_SMARTWEB)
-#else
-# define machine_is_smartweb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MV86XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MV86XX
-# endif
-# define machine_is_mv86xx()	(machine_arch_type == MACH_TYPE_MV86XX)
-#else
-# define machine_is_mv86xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MV87XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MV87XX
-# endif
-# define machine_is_mv87xx()	(machine_arch_type == MACH_TYPE_MV87XX)
-#else
-# define machine_is_mv87xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SONGYOUNGHO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SONGYOUNGHO
-# endif
-# define machine_is_songyoungho()	(machine_arch_type == MACH_TYPE_SONGYOUNGHO)
-#else
-# define machine_is_songyoungho()	(0)
-#endif
-
-#ifdef CONFIG_MACH_YOUNGHOTEMA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_YOUNGHOTEMA
-# endif
-# define machine_is_younghotema()	(machine_arch_type == MACH_TYPE_YOUNGHOTEMA)
-#else
-# define machine_is_younghotema()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PCM037
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PCM037
-# endif
-# define machine_is_pcm037()	(machine_arch_type == MACH_TYPE_PCM037)
-#else
-# define machine_is_pcm037()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MMVP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MMVP
-# endif
-# define machine_is_mmvp()	(machine_arch_type == MACH_TYPE_MMVP)
-#else
-# define machine_is_mmvp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MMAP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MMAP
-# endif
-# define machine_is_mmap()	(machine_arch_type == MACH_TYPE_MMAP)
-#else
-# define machine_is_mmap()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PTID2410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PTID2410
-# endif
-# define machine_is_ptid2410()	(machine_arch_type == MACH_TYPE_PTID2410)
-#else
-# define machine_is_ptid2410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_JAMES_926
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_JAMES_926
-# endif
-# define machine_is_james_926()	(machine_arch_type == MACH_TYPE_JAMES_926)
-#else
-# define machine_is_james_926()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FM6000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FM6000
-# endif
-# define machine_is_fm6000()	(machine_arch_type == MACH_TYPE_FM6000)
-#else
-# define machine_is_fm6000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DB88F6281_BP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DB88F6281_BP
-# endif
-# define machine_is_db88f6281_bp()	(machine_arch_type == MACH_TYPE_DB88F6281_BP)
-#else
-# define machine_is_db88f6281_bp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RD88F6192_NAS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RD88F6192_NAS
-# endif
-# define machine_is_rd88f6192_nas()	(machine_arch_type == MACH_TYPE_RD88F6192_NAS)
-#else
-# define machine_is_rd88f6192_nas()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RD88F6281
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RD88F6281
-# endif
-# define machine_is_rd88f6281()	(machine_arch_type == MACH_TYPE_RD88F6281)
-#else
-# define machine_is_rd88f6281()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DB78X00_BP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DB78X00_BP
-# endif
-# define machine_is_db78x00_bp()	(machine_arch_type == MACH_TYPE_DB78X00_BP)
-#else
-# define machine_is_db78x00_bp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK2416
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMDK2416
-# endif
-# define machine_is_smdk2416()	(machine_arch_type == MACH_TYPE_SMDK2416)
-#else
-# define machine_is_smdk2416()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OCE_SPIDER_SI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OCE_SPIDER_SI
-# endif
-# define machine_is_oce_spider_si()	(machine_arch_type == MACH_TYPE_OCE_SPIDER_SI)
-#else
-# define machine_is_oce_spider_si()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OCE_SPIDER_SK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OCE_SPIDER_SK
-# endif
-# define machine_is_oce_spider_sk()	(machine_arch_type == MACH_TYPE_OCE_SPIDER_SK)
-#else
-# define machine_is_oce_spider_sk()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ROVERN6
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ROVERN6
-# endif
-# define machine_is_rovern6()	(machine_arch_type == MACH_TYPE_ROVERN6)
-#else
-# define machine_is_rovern6()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PELCO_EVOLUTION
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PELCO_EVOLUTION
-# endif
-# define machine_is_pelco_evolution()	(machine_arch_type == MACH_TYPE_PELCO_EVOLUTION)
-#else
-# define machine_is_pelco_evolution()	(0)
-#endif
-
-#ifdef CONFIG_MACH_WBD111
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WBD111
-# endif
-# define machine_is_wbd111()	(machine_arch_type == MACH_TYPE_WBD111)
-#else
-# define machine_is_wbd111()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ELARACPE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ELARACPE
-# endif
-# define machine_is_elaracpe()	(machine_arch_type == MACH_TYPE_ELARACPE)
-#else
-# define machine_is_elaracpe()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MABV3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MABV3
-# endif
-# define machine_is_mabv3()	(machine_arch_type == MACH_TYPE_MABV3)
-#else
-# define machine_is_mabv3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MV2120
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MV2120
-# endif
-# define machine_is_mv2120()	(machine_arch_type == MACH_TYPE_MV2120)
-#else
-# define machine_is_mv2120()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CSB737
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CSB737
-# endif
-# define machine_is_csb737()	(machine_arch_type == MACH_TYPE_CSB737)
-#else
-# define machine_is_csb737()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX51_3DS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX51_3DS
-# endif
-# define machine_is_mx51_3ds()	(machine_arch_type == MACH_TYPE_MX51_3DS)
-#else
-# define machine_is_mx51_3ds()	(0)
-#endif
-
-#ifdef CONFIG_MACH_G900
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_G900
-# endif
-# define machine_is_g900()	(machine_arch_type == MACH_TYPE_G900)
-#else
-# define machine_is_g900()	(0)
-#endif
-
-#ifdef CONFIG_MACH_APF27
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_APF27
-# endif
-# define machine_is_apf27()	(machine_arch_type == MACH_TYPE_APF27)
-#else
-# define machine_is_apf27()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GGUS2000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GGUS2000
-# endif
-# define machine_is_ggus2000()	(machine_arch_type == MACH_TYPE_GGUS2000)
-#else
-# define machine_is_ggus2000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_2430_MIMIC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_2430_MIMIC
-# endif
-# define machine_is_omap_2430_mimic()	(machine_arch_type == MACH_TYPE_OMAP_2430_MIMIC)
-#else
-# define machine_is_omap_2430_mimic()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IMX27LITE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IMX27LITE
-# endif
-# define machine_is_imx27lite()	(machine_arch_type == MACH_TYPE_IMX27LITE)
-#else
-# define machine_is_imx27lite()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ALMEX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ALMEX
-# endif
-# define machine_is_almex()	(machine_arch_type == MACH_TYPE_ALMEX)
-#else
-# define machine_is_almex()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CONTROL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CONTROL
-# endif
-# define machine_is_control()	(machine_arch_type == MACH_TYPE_CONTROL)
-#else
-# define machine_is_control()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MBA2410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MBA2410
-# endif
-# define machine_is_mba2410()	(machine_arch_type == MACH_TYPE_MBA2410)
-#else
-# define machine_is_mba2410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VOLCANO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VOLCANO
-# endif
-# define machine_is_volcano()	(machine_arch_type == MACH_TYPE_VOLCANO)
-#else
-# define machine_is_volcano()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZENITH
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZENITH
-# endif
-# define machine_is_zenith()	(machine_arch_type == MACH_TYPE_ZENITH)
-#else
-# define machine_is_zenith()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MUCHIP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MUCHIP
-# endif
-# define machine_is_muchip()	(machine_arch_type == MACH_TYPE_MUCHIP)
-#else
-# define machine_is_muchip()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MAGELLAN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MAGELLAN
-# endif
-# define machine_is_magellan()	(machine_arch_type == MACH_TYPE_MAGELLAN)
-#else
-# define machine_is_magellan()	(0)
-#endif
-
-#ifdef CONFIG_MACH_USB_A9260
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_USB_A9260
-# endif
-# define machine_is_usb_a9260()	(machine_arch_type == MACH_TYPE_USB_A9260)
-#else
-# define machine_is_usb_a9260()	(0)
-#endif
-
-#ifdef CONFIG_MACH_USB_A9263
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_USB_A9263
-# endif
-# define machine_is_usb_a9263()	(machine_arch_type == MACH_TYPE_USB_A9263)
-#else
-# define machine_is_usb_a9263()	(0)
-#endif
-
-#ifdef CONFIG_MACH_QIL_A9260
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_QIL_A9260
-# endif
-# define machine_is_qil_a9260()	(machine_arch_type == MACH_TYPE_QIL_A9260)
-#else
-# define machine_is_qil_a9260()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CME9210
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CME9210
-# endif
-# define machine_is_cme9210()	(machine_arch_type == MACH_TYPE_CME9210)
-#else
-# define machine_is_cme9210()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HCZH4
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HCZH4
-# endif
-# define machine_is_hczh4()	(machine_arch_type == MACH_TYPE_HCZH4)
-#else
-# define machine_is_hczh4()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SPEARBASIC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SPEARBASIC
-# endif
-# define machine_is_spearbasic()	(machine_arch_type == MACH_TYPE_SPEARBASIC)
-#else
-# define machine_is_spearbasic()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DEP2440
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DEP2440
-# endif
-# define machine_is_dep2440()	(machine_arch_type == MACH_TYPE_DEP2440)
-#else
-# define machine_is_dep2440()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HDL_GXR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HDL_GXR
-# endif
-# define machine_is_hdl_gxr()	(machine_arch_type == MACH_TYPE_HDL_GXR)
-#else
-# define machine_is_hdl_gxr()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HDL_GT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HDL_GT
-# endif
-# define machine_is_hdl_gt()	(machine_arch_type == MACH_TYPE_HDL_GT)
-#else
-# define machine_is_hdl_gt()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HDL_4G
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HDL_4G
-# endif
-# define machine_is_hdl_4g()	(machine_arch_type == MACH_TYPE_HDL_4G)
-#else
-# define machine_is_hdl_4g()	(0)
-#endif
-
-#ifdef CONFIG_MACH_S3C6000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S3C6000
-# endif
-# define machine_is_s3c6000()	(machine_arch_type == MACH_TYPE_S3C6000)
-#else
-# define machine_is_s3c6000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MMSP2_MDK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MMSP2_MDK
-# endif
-# define machine_is_mmsp2_mdk()	(machine_arch_type == MACH_TYPE_MMSP2_MDK)
-#else
-# define machine_is_mmsp2_mdk()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MPX220
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MPX220
-# endif
-# define machine_is_mpx220()	(machine_arch_type == MACH_TYPE_MPX220)
-#else
-# define machine_is_mpx220()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KZM_ARM11_01
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KZM_ARM11_01
-# endif
-# define machine_is_kzm_arm11_01()	(machine_arch_type == MACH_TYPE_KZM_ARM11_01)
-#else
-# define machine_is_kzm_arm11_01()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTC_POLARIS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTC_POLARIS
-# endif
-# define machine_is_htc_polaris()	(machine_arch_type == MACH_TYPE_HTC_POLARIS)
-#else
-# define machine_is_htc_polaris()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTC_KAISER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTC_KAISER
-# endif
-# define machine_is_htc_kaiser()	(machine_arch_type == MACH_TYPE_HTC_KAISER)
-#else
-# define machine_is_htc_kaiser()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LG_KS20
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LG_KS20
-# endif
-# define machine_is_lg_ks20()	(machine_arch_type == MACH_TYPE_LG_KS20)
-#else
-# define machine_is_lg_ks20()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HHGPS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HHGPS
-# endif
-# define machine_is_hhgps()	(machine_arch_type == MACH_TYPE_HHGPS)
-#else
-# define machine_is_hhgps()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NOKIA_N810_WIMAX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NOKIA_N810_WIMAX
-# endif
-# define machine_is_nokia_n810_wimax()	(machine_arch_type == MACH_TYPE_NOKIA_N810_WIMAX)
-#else
-# define machine_is_nokia_n810_wimax()	(0)
-#endif
-
-#ifdef CONFIG_MACH_INSIGHT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_INSIGHT
-# endif
-# define machine_is_insight()	(machine_arch_type == MACH_TYPE_INSIGHT)
-#else
-# define machine_is_insight()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SAPPHIRE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SAPPHIRE
-# endif
-# define machine_is_sapphire()	(machine_arch_type == MACH_TYPE_SAPPHIRE)
-#else
-# define machine_is_sapphire()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CSB637XO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CSB637XO
-# endif
-# define machine_is_csb637xo()	(machine_arch_type == MACH_TYPE_CSB637XO)
-#else
-# define machine_is_csb637xo()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EVISIONG
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EVISIONG
-# endif
-# define machine_is_evisiong()	(machine_arch_type == MACH_TYPE_EVISIONG)
-#else
-# define machine_is_evisiong()	(0)
-#endif
-
-#ifdef CONFIG_MACH_STMP37XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STMP37XX
-# endif
-# define machine_is_stmp37xx()	(machine_arch_type == MACH_TYPE_STMP37XX)
-#else
-# define machine_is_stmp37xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_STMP378X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STMP378X
-# endif
-# define machine_is_stmp378x()	(machine_arch_type == MACH_TYPE_STMP378X)
-#else
-# define machine_is_stmp378x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TNT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TNT
-# endif
-# define machine_is_tnt()	(machine_arch_type == MACH_TYPE_TNT)
-#else
-# define machine_is_tnt()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TBXT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TBXT
-# endif
-# define machine_is_tbxt()	(machine_arch_type == MACH_TYPE_TBXT)
-#else
-# define machine_is_tbxt()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PLAYMATE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PLAYMATE
-# endif
-# define machine_is_playmate()	(machine_arch_type == MACH_TYPE_PLAYMATE)
-#else
-# define machine_is_playmate()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PNS10
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PNS10
-# endif
-# define machine_is_pns10()	(machine_arch_type == MACH_TYPE_PNS10)
-#else
-# define machine_is_pns10()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EZNAVI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EZNAVI
-# endif
-# define machine_is_eznavi()	(machine_arch_type == MACH_TYPE_EZNAVI)
-#else
-# define machine_is_eznavi()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PS4000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PS4000
-# endif
-# define machine_is_ps4000()	(machine_arch_type == MACH_TYPE_PS4000)
-#else
-# define machine_is_ps4000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EZX_A780
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EZX_A780
-# endif
-# define machine_is_ezx_a780()	(machine_arch_type == MACH_TYPE_EZX_A780)
-#else
-# define machine_is_ezx_a780()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EZX_E680
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EZX_E680
-# endif
-# define machine_is_ezx_e680()	(machine_arch_type == MACH_TYPE_EZX_E680)
-#else
-# define machine_is_ezx_e680()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EZX_A1200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EZX_A1200
-# endif
-# define machine_is_ezx_a1200()	(machine_arch_type == MACH_TYPE_EZX_A1200)
-#else
-# define machine_is_ezx_a1200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EZX_E6
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EZX_E6
-# endif
-# define machine_is_ezx_e6()	(machine_arch_type == MACH_TYPE_EZX_E6)
-#else
-# define machine_is_ezx_e6()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EZX_E2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EZX_E2
-# endif
-# define machine_is_ezx_e2()	(machine_arch_type == MACH_TYPE_EZX_E2)
-#else
-# define machine_is_ezx_e2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EZX_A910
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EZX_A910
-# endif
-# define machine_is_ezx_a910()	(machine_arch_type == MACH_TYPE_EZX_A910)
-#else
-# define machine_is_ezx_a910()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CWMX31
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CWMX31
-# endif
-# define machine_is_cwmx31()	(machine_arch_type == MACH_TYPE_CWMX31)
-#else
-# define machine_is_cwmx31()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SL2312
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SL2312
-# endif
-# define machine_is_sl2312()	(machine_arch_type == MACH_TYPE_SL2312)
-#else
-# define machine_is_sl2312()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BLENNY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BLENNY
-# endif
-# define machine_is_blenny()	(machine_arch_type == MACH_TYPE_BLENNY)
-#else
-# define machine_is_blenny()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DS107
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DS107
-# endif
-# define machine_is_ds107()	(machine_arch_type == MACH_TYPE_DS107)
-#else
-# define machine_is_ds107()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DSX07
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DSX07
-# endif
-# define machine_is_dsx07()	(machine_arch_type == MACH_TYPE_DSX07)
-#else
-# define machine_is_dsx07()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PICOCOM1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PICOCOM1
-# endif
-# define machine_is_picocom1()	(machine_arch_type == MACH_TYPE_PICOCOM1)
-#else
-# define machine_is_picocom1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LYNX_WOLVERINE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LYNX_WOLVERINE
-# endif
-# define machine_is_lynx_wolverine()	(machine_arch_type == MACH_TYPE_LYNX_WOLVERINE)
-#else
-# define machine_is_lynx_wolverine()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UBISYS_P9_SC19
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UBISYS_P9_SC19
-# endif
-# define machine_is_ubisys_p9_sc19()	(machine_arch_type == MACH_TYPE_UBISYS_P9_SC19)
-#else
-# define machine_is_ubisys_p9_sc19()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KRATOS_LOW
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KRATOS_LOW
-# endif
-# define machine_is_kratos_low()	(machine_arch_type == MACH_TYPE_KRATOS_LOW)
-#else
-# define machine_is_kratos_low()	(0)
-#endif
-
-#ifdef CONFIG_MACH_M700
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_M700
-# endif
-# define machine_is_m700()	(machine_arch_type == MACH_TYPE_M700)
-#else
-# define machine_is_m700()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EDMINI_V2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EDMINI_V2
-# endif
-# define machine_is_edmini_v2()	(machine_arch_type == MACH_TYPE_EDMINI_V2)
-#else
-# define machine_is_edmini_v2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZIPIT2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZIPIT2
-# endif
-# define machine_is_zipit2()	(machine_arch_type == MACH_TYPE_ZIPIT2)
-#else
-# define machine_is_zipit2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HSLFEMTOCELL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HSLFEMTOCELL
-# endif
-# define machine_is_hslfemtocell()	(machine_arch_type == MACH_TYPE_HSLFEMTOCELL)
-#else
-# define machine_is_hslfemtocell()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DAINTREE_AT91
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DAINTREE_AT91
-# endif
-# define machine_is_daintree_at91()	(machine_arch_type == MACH_TYPE_DAINTREE_AT91)
-#else
-# define machine_is_daintree_at91()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SG560USB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SG560USB
-# endif
-# define machine_is_sg560usb()	(machine_arch_type == MACH_TYPE_SG560USB)
-#else
-# define machine_is_sg560usb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_PANDORA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP3_PANDORA
-# endif
-# define machine_is_omap3_pandora()	(machine_arch_type == MACH_TYPE_OMAP3_PANDORA)
-#else
-# define machine_is_omap3_pandora()	(0)
-#endif
-
-#ifdef CONFIG_MACH_USR8200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_USR8200
-# endif
-# define machine_is_usr8200()	(machine_arch_type == MACH_TYPE_USR8200)
-#else
-# define machine_is_usr8200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_S1S65K
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S1S65K
-# endif
-# define machine_is_s1s65k()	(machine_arch_type == MACH_TYPE_S1S65K)
-#else
-# define machine_is_s1s65k()	(0)
-#endif
-
-#ifdef CONFIG_MACH_S2S65A
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S2S65A
-# endif
-# define machine_is_s2s65a()	(machine_arch_type == MACH_TYPE_S2S65A)
-#else
-# define machine_is_s2s65a()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ICORE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ICORE
-# endif
-# define machine_is_icore()	(machine_arch_type == MACH_TYPE_ICORE)
-#else
-# define machine_is_icore()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MSS2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MSS2
-# endif
-# define machine_is_mss2()	(machine_arch_type == MACH_TYPE_MSS2)
-#else
-# define machine_is_mss2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BELMONT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BELMONT
-# endif
-# define machine_is_belmont()	(machine_arch_type == MACH_TYPE_BELMONT)
-#else
-# define machine_is_belmont()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ASUSP525
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ASUSP525
-# endif
-# define machine_is_asusp525()	(machine_arch_type == MACH_TYPE_ASUSP525)
-#else
-# define machine_is_asusp525()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LB88RC8480
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LB88RC8480
-# endif
-# define machine_is_lb88rc8480()	(machine_arch_type == MACH_TYPE_LB88RC8480)
-#else
-# define machine_is_lb88rc8480()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HIPXA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HIPXA
-# endif
-# define machine_is_hipxa()	(machine_arch_type == MACH_TYPE_HIPXA)
-#else
-# define machine_is_hipxa()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX25_3DS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX25_3DS
-# endif
-# define machine_is_mx25_3ds()	(machine_arch_type == MACH_TYPE_MX25_3DS)
-#else
-# define machine_is_mx25_3ds()	(0)
-#endif
-
-#ifdef CONFIG_MACH_M800
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_M800
-# endif
-# define machine_is_m800()	(machine_arch_type == MACH_TYPE_M800)
-#else
-# define machine_is_m800()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3530_LV_SOM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP3530_LV_SOM
-# endif
-# define machine_is_omap3530_lv_som()	(machine_arch_type == MACH_TYPE_OMAP3530_LV_SOM)
-#else
-# define machine_is_omap3530_lv_som()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PRIMA_EVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PRIMA_EVB
-# endif
-# define machine_is_prima_evb()	(machine_arch_type == MACH_TYPE_PRIMA_EVB)
-#else
-# define machine_is_prima_evb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX31BT1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX31BT1
-# endif
-# define machine_is_mx31bt1()	(machine_arch_type == MACH_TYPE_MX31BT1)
-#else
-# define machine_is_mx31bt1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ATLAS4_EVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ATLAS4_EVB
-# endif
-# define machine_is_atlas4_evb()	(machine_arch_type == MACH_TYPE_ATLAS4_EVB)
-#else
-# define machine_is_atlas4_evb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX31CICADA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX31CICADA
-# endif
-# define machine_is_mx31cicada()	(machine_arch_type == MACH_TYPE_MX31CICADA)
-#else
-# define machine_is_mx31cicada()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MI424WR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MI424WR
-# endif
-# define machine_is_mi424wr()	(machine_arch_type == MACH_TYPE_MI424WR)
-#else
-# define machine_is_mi424wr()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AXS_ULTRAX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AXS_ULTRAX
-# endif
-# define machine_is_axs_ultrax()	(machine_arch_type == MACH_TYPE_AXS_ULTRAX)
-#else
-# define machine_is_axs_ultrax()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT572D940DEB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT572D940DEB
-# endif
-# define machine_is_at572d940deb()	(machine_arch_type == MACH_TYPE_AT572D940DEB)
-#else
-# define machine_is_at572d940deb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_DA830_EVM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DAVINCI_DA830_EVM
-# endif
-# define machine_is_davinci_da830_evm()	(machine_arch_type == MACH_TYPE_DAVINCI_DA830_EVM)
-#else
-# define machine_is_davinci_da830_evm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EP9302
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EP9302
-# endif
-# define machine_is_ep9302()	(machine_arch_type == MACH_TYPE_EP9302)
-#else
-# define machine_is_ep9302()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT572D940HFEB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT572D940HFEB
-# endif
-# define machine_is_at572d940hfek()	(machine_arch_type == MACH_TYPE_AT572D940HFEB)
-#else
-# define machine_is_at572d940hfek()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CYBOOK3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CYBOOK3
-# endif
-# define machine_is_cybook3()	(machine_arch_type == MACH_TYPE_CYBOOK3)
-#else
-# define machine_is_cybook3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_WDG002
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WDG002
-# endif
-# define machine_is_wdg002()	(machine_arch_type == MACH_TYPE_WDG002)
-#else
-# define machine_is_wdg002()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SG560ADSL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SG560ADSL
-# endif
-# define machine_is_sg560adsl()	(machine_arch_type == MACH_TYPE_SG560ADSL)
-#else
-# define machine_is_sg560adsl()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NEXTIO_N2800_ICA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NEXTIO_N2800_ICA
-# endif
-# define machine_is_nextio_n2800_ica()	(machine_arch_type == MACH_TYPE_NEXTIO_N2800_ICA)
-#else
-# define machine_is_nextio_n2800_ica()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MARVELL_NEWDB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MARVELL_NEWDB
-# endif
-# define machine_is_marvell_newdb()	(machine_arch_type == MACH_TYPE_MARVELL_NEWDB)
-#else
-# define machine_is_marvell_newdb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VANDIHUD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VANDIHUD
-# endif
-# define machine_is_vandihud()	(machine_arch_type == MACH_TYPE_VANDIHUD)
-#else
-# define machine_is_vandihud()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MAGX_E8
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MAGX_E8
-# endif
-# define machine_is_magx_e8()	(machine_arch_type == MACH_TYPE_MAGX_E8)
-#else
-# define machine_is_magx_e8()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MAGX_Z6
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MAGX_Z6
-# endif
-# define machine_is_magx_z6()	(machine_arch_type == MACH_TYPE_MAGX_Z6)
-#else
-# define machine_is_magx_z6()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MAGX_V8
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MAGX_V8
-# endif
-# define machine_is_magx_v8()	(machine_arch_type == MACH_TYPE_MAGX_V8)
-#else
-# define machine_is_magx_v8()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MAGX_U9
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MAGX_U9
-# endif
-# define machine_is_magx_u9()	(machine_arch_type == MACH_TYPE_MAGX_U9)
-#else
-# define machine_is_magx_u9()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TOUGHCF08
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TOUGHCF08
-# endif
-# define machine_is_toughcf08()	(machine_arch_type == MACH_TYPE_TOUGHCF08)
-#else
-# define machine_is_toughcf08()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZW4400
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZW4400
-# endif
-# define machine_is_zw4400()	(machine_arch_type == MACH_TYPE_ZW4400)
-#else
-# define machine_is_zw4400()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MARAT91
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MARAT91
-# endif
-# define machine_is_marat91()	(machine_arch_type == MACH_TYPE_MARAT91)
-#else
-# define machine_is_marat91()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OVERO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OVERO
-# endif
-# define machine_is_overo()	(machine_arch_type == MACH_TYPE_OVERO)
-#else
-# define machine_is_overo()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT2440EVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT2440EVB
-# endif
-# define machine_is_at2440evb()	(machine_arch_type == MACH_TYPE_AT2440EVB)
-#else
-# define machine_is_at2440evb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NEOCORE926
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NEOCORE926
-# endif
-# define machine_is_neocore926()	(machine_arch_type == MACH_TYPE_NEOCORE926)
-#else
-# define machine_is_neocore926()	(0)
-#endif
-
-#ifdef CONFIG_MACH_WNR854T
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WNR854T
-# endif
-# define machine_is_wnr854t()	(machine_arch_type == MACH_TYPE_WNR854T)
-#else
-# define machine_is_wnr854t()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IMX27
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IMX27
-# endif
-# define machine_is_imx27()	(machine_arch_type == MACH_TYPE_IMX27)
-#else
-# define machine_is_imx27()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MOOSE_DB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MOOSE_DB
-# endif
-# define machine_is_moose_db()	(machine_arch_type == MACH_TYPE_MOOSE_DB)
-#else
-# define machine_is_moose_db()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FAB4
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FAB4
-# endif
-# define machine_is_fab4()	(machine_arch_type == MACH_TYPE_FAB4)
-#else
-# define machine_is_fab4()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCDIAMOND
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCDIAMOND
-# endif
-# define machine_is_htcdiamond()	(machine_arch_type == MACH_TYPE_HTCDIAMOND)
-#else
-# define machine_is_htcdiamond()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FIONA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FIONA
-# endif
-# define machine_is_fiona()	(machine_arch_type == MACH_TYPE_FIONA)
-#else
-# define machine_is_fiona()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MXC30030_X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MXC30030_X
-# endif
-# define machine_is_mxc30030_x()	(machine_arch_type == MACH_TYPE_MXC30030_X)
-#else
-# define machine_is_mxc30030_x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BMP1000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BMP1000
-# endif
-# define machine_is_bmp1000()	(machine_arch_type == MACH_TYPE_BMP1000)
-#else
-# define machine_is_bmp1000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LOGI9200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LOGI9200
-# endif
-# define machine_is_logi9200()	(machine_arch_type == MACH_TYPE_LOGI9200)
-#else
-# define machine_is_logi9200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TQMA31
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TQMA31
-# endif
-# define machine_is_tqma31()	(machine_arch_type == MACH_TYPE_TQMA31)
-#else
-# define machine_is_tqma31()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CCW9P9215JS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CCW9P9215JS
-# endif
-# define machine_is_ccw9p9215js()	(machine_arch_type == MACH_TYPE_CCW9P9215JS)
-#else
-# define machine_is_ccw9p9215js()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RD88F5181L_GE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RD88F5181L_GE
-# endif
-# define machine_is_rd88f5181l_ge()	(machine_arch_type == MACH_TYPE_RD88F5181L_GE)
-#else
-# define machine_is_rd88f5181l_ge()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SIFMAIN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SIFMAIN
-# endif
-# define machine_is_sifmain()	(machine_arch_type == MACH_TYPE_SIFMAIN)
-#else
-# define machine_is_sifmain()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SAM9_L9261
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SAM9_L9261
-# endif
-# define machine_is_sam9_l9261()	(machine_arch_type == MACH_TYPE_SAM9_L9261)
-#else
-# define machine_is_sam9_l9261()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CC9M2443
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CC9M2443
-# endif
-# define machine_is_cc9m2443()	(machine_arch_type == MACH_TYPE_CC9M2443)
-#else
-# define machine_is_cc9m2443()	(0)
-#endif
-
-#ifdef CONFIG_MACH_XARIA300
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XARIA300
-# endif
-# define machine_is_xaria300()	(machine_arch_type == MACH_TYPE_XARIA300)
-#else
-# define machine_is_xaria300()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IT9200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IT9200
-# endif
-# define machine_is_it9200()	(machine_arch_type == MACH_TYPE_IT9200)
-#else
-# define machine_is_it9200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RD88F5181L_FXO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RD88F5181L_FXO
-# endif
-# define machine_is_rd88f5181l_fxo()	(machine_arch_type == MACH_TYPE_RD88F5181L_FXO)
-#else
-# define machine_is_rd88f5181l_fxo()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KRISS_SENSOR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KRISS_SENSOR
-# endif
-# define machine_is_kriss_sensor()	(machine_arch_type == MACH_TYPE_KRISS_SENSOR)
-#else
-# define machine_is_kriss_sensor()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PILZ_PMI5
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PILZ_PMI5
-# endif
-# define machine_is_pilz_pmi5()	(machine_arch_type == MACH_TYPE_PILZ_PMI5)
-#else
-# define machine_is_pilz_pmi5()	(0)
-#endif
-
-#ifdef CONFIG_MACH_JADE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_JADE
-# endif
-# define machine_is_jade()	(machine_arch_type == MACH_TYPE_JADE)
-#else
-# define machine_is_jade()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KS8695_SOFTPLC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KS8695_SOFTPLC
-# endif
-# define machine_is_ks8695_softplc()	(machine_arch_type == MACH_TYPE_KS8695_SOFTPLC)
-#else
-# define machine_is_ks8695_softplc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GPRISC3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GPRISC3
-# endif
-# define machine_is_gprisc3()	(machine_arch_type == MACH_TYPE_GPRISC3)
-#else
-# define machine_is_gprisc3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_STAMP9G20
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STAMP9G20
-# endif
-# define machine_is_stamp9g20()	(machine_arch_type == MACH_TYPE_STAMP9G20)
-#else
-# define machine_is_stamp9g20()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK6430
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMDK6430
-# endif
-# define machine_is_smdk6430()	(machine_arch_type == MACH_TYPE_SMDK6430)
-#else
-# define machine_is_smdk6430()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SMDKC100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMDKC100
-# endif
-# define machine_is_smdkc100()	(machine_arch_type == MACH_TYPE_SMDKC100)
-#else
-# define machine_is_smdkc100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TAVOREVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TAVOREVB
-# endif
-# define machine_is_tavorevb()	(machine_arch_type == MACH_TYPE_TAVOREVB)
-#else
-# define machine_is_tavorevb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SAAR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SAAR
-# endif
-# define machine_is_saar()	(machine_arch_type == MACH_TYPE_SAAR)
-#else
-# define machine_is_saar()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DEISTER_EYECAM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DEISTER_EYECAM
-# endif
-# define machine_is_deister_eyecam()	(machine_arch_type == MACH_TYPE_DEISTER_EYECAM)
-#else
-# define machine_is_deister_eyecam()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM9M10G45EK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91SAM9M10G45EK
-# endif
-# define machine_is_at91sam9m10g45ek()	(machine_arch_type == MACH_TYPE_AT91SAM9M10G45EK)
-#else
-# define machine_is_at91sam9m10g45ek()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LINKSTATION_PRODUO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LINKSTATION_PRODUO
-# endif
-# define machine_is_linkstation_produo()	(machine_arch_type == MACH_TYPE_LINKSTATION_PRODUO)
-#else
-# define machine_is_linkstation_produo()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HIT_B0
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HIT_B0
-# endif
-# define machine_is_hit_b0()	(machine_arch_type == MACH_TYPE_HIT_B0)
-#else
-# define machine_is_hit_b0()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ADX_RMU
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADX_RMU
-# endif
-# define machine_is_adx_rmu()	(machine_arch_type == MACH_TYPE_ADX_RMU)
-#else
-# define machine_is_adx_rmu()	(0)
-#endif
-
-#ifdef CONFIG_MACH_XG_CPE_MAIN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XG_CPE_MAIN
-# endif
-# define machine_is_xg_cpe_main()	(machine_arch_type == MACH_TYPE_XG_CPE_MAIN)
-#else
-# define machine_is_xg_cpe_main()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EDB9407A
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EDB9407A
-# endif
-# define machine_is_edb9407a()	(machine_arch_type == MACH_TYPE_EDB9407A)
-#else
-# define machine_is_edb9407a()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DTB9608
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DTB9608
-# endif
-# define machine_is_dtb9608()	(machine_arch_type == MACH_TYPE_DTB9608)
-#else
-# define machine_is_dtb9608()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EM104V1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EM104V1
-# endif
-# define machine_is_em104v1()	(machine_arch_type == MACH_TYPE_EM104V1)
-#else
-# define machine_is_em104v1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DEMO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DEMO
-# endif
-# define machine_is_demo()	(machine_arch_type == MACH_TYPE_DEMO)
-#else
-# define machine_is_demo()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LOGI9260
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LOGI9260
-# endif
-# define machine_is_logi9260()	(machine_arch_type == MACH_TYPE_LOGI9260)
-#else
-# define machine_is_logi9260()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX31_EXM32
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX31_EXM32
-# endif
-# define machine_is_mx31_exm32()	(machine_arch_type == MACH_TYPE_MX31_EXM32)
-#else
-# define machine_is_mx31_exm32()	(0)
-#endif
-
-#ifdef CONFIG_MACH_USB_A9G20
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_USB_A9G20
-# endif
-# define machine_is_usb_a9g20()	(machine_arch_type == MACH_TYPE_USB_A9G20)
-#else
-# define machine_is_usb_a9g20()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PICPROJE2008
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PICPROJE2008
-# endif
-# define machine_is_picproje2008()	(machine_arch_type == MACH_TYPE_PICPROJE2008)
-#else
-# define machine_is_picproje2008()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CS_E9315
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CS_E9315
-# endif
-# define machine_is_cs_e9315()	(machine_arch_type == MACH_TYPE_CS_E9315)
-#else
-# define machine_is_cs_e9315()	(0)
-#endif
-
-#ifdef CONFIG_MACH_QIL_A9G20
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_QIL_A9G20
-# endif
-# define machine_is_qil_a9g20()	(machine_arch_type == MACH_TYPE_QIL_A9G20)
-#else
-# define machine_is_qil_a9g20()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SHA_PON020
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SHA_PON020
-# endif
-# define machine_is_sha_pon020()	(machine_arch_type == MACH_TYPE_SHA_PON020)
-#else
-# define machine_is_sha_pon020()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NAD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NAD
-# endif
-# define machine_is_nad()	(machine_arch_type == MACH_TYPE_NAD)
-#else
-# define machine_is_nad()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SBC35_A9260
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SBC35_A9260
-# endif
-# define machine_is_sbc35_a9260()	(machine_arch_type == MACH_TYPE_SBC35_A9260)
-#else
-# define machine_is_sbc35_a9260()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SBC35_A9G20
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SBC35_A9G20
-# endif
-# define machine_is_sbc35_a9g20()	(machine_arch_type == MACH_TYPE_SBC35_A9G20)
-#else
-# define machine_is_sbc35_a9g20()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_BEGINNING
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DAVINCI_BEGINNING
-# endif
-# define machine_is_davinci_beginning()	(machine_arch_type == MACH_TYPE_DAVINCI_BEGINNING)
-#else
-# define machine_is_davinci_beginning()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UWC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UWC
-# endif
-# define machine_is_uwc()	(machine_arch_type == MACH_TYPE_UWC)
-#else
-# define machine_is_uwc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MXLADS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MXLADS
-# endif
-# define machine_is_mxlads()	(machine_arch_type == MACH_TYPE_MXLADS)
-#else
-# define machine_is_mxlads()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCNIKE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCNIKE
-# endif
-# define machine_is_htcnike()	(machine_arch_type == MACH_TYPE_HTCNIKE)
-#else
-# define machine_is_htcnike()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DEISTER_PXA270
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DEISTER_PXA270
-# endif
-# define machine_is_deister_pxa270()	(machine_arch_type == MACH_TYPE_DEISTER_PXA270)
-#else
-# define machine_is_deister_pxa270()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CME9210JS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CME9210JS
-# endif
-# define machine_is_cme9210js()	(machine_arch_type == MACH_TYPE_CME9210JS)
-#else
-# define machine_is_cme9210js()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CC9P9360
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CC9P9360
-# endif
-# define machine_is_cc9p9360()	(machine_arch_type == MACH_TYPE_CC9P9360)
-#else
-# define machine_is_cc9p9360()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MOCHA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MOCHA
-# endif
-# define machine_is_mocha()	(machine_arch_type == MACH_TYPE_MOCHA)
-#else
-# define machine_is_mocha()	(0)
-#endif
-
-#ifdef CONFIG_MACH_WAPD170AG
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WAPD170AG
-# endif
-# define machine_is_wapd170ag()	(machine_arch_type == MACH_TYPE_WAPD170AG)
-#else
-# define machine_is_wapd170ag()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LINKSTATION_MINI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LINKSTATION_MINI
-# endif
-# define machine_is_linkstation_mini()	(machine_arch_type == MACH_TYPE_LINKSTATION_MINI)
-#else
-# define machine_is_linkstation_mini()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AFEB9260
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AFEB9260
-# endif
-# define machine_is_afeb9260()	(machine_arch_type == MACH_TYPE_AFEB9260)
-#else
-# define machine_is_afeb9260()	(0)
-#endif
-
-#ifdef CONFIG_MACH_W90X900
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_W90X900
-# endif
-# define machine_is_w90x900()	(machine_arch_type == MACH_TYPE_W90X900)
-#else
-# define machine_is_w90x900()	(0)
-#endif
-
-#ifdef CONFIG_MACH_W90X700
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_W90X700
-# endif
-# define machine_is_w90x700()	(machine_arch_type == MACH_TYPE_W90X700)
-#else
-# define machine_is_w90x700()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KT300IP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KT300IP
-# endif
-# define machine_is_kt300ip()	(machine_arch_type == MACH_TYPE_KT300IP)
-#else
-# define machine_is_kt300ip()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KT300IP_G20
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KT300IP_G20
-# endif
-# define machine_is_kt300ip_g20()	(machine_arch_type == MACH_TYPE_KT300IP_G20)
-#else
-# define machine_is_kt300ip_g20()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SRCM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SRCM
-# endif
-# define machine_is_srcm()	(machine_arch_type == MACH_TYPE_SRCM)
-#else
-# define machine_is_srcm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_WLNX_9260
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WLNX_9260
-# endif
-# define machine_is_wlnx_9260()	(machine_arch_type == MACH_TYPE_WLNX_9260)
-#else
-# define machine_is_wlnx_9260()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OPENMOKO_GTA03
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OPENMOKO_GTA03
-# endif
-# define machine_is_openmoko_gta03()	(machine_arch_type == MACH_TYPE_OPENMOKO_GTA03)
-#else
-# define machine_is_openmoko_gta03()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OSPREY2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OSPREY2
-# endif
-# define machine_is_osprey2()	(machine_arch_type == MACH_TYPE_OSPREY2)
-#else
-# define machine_is_osprey2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KBIO9260
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KBIO9260
-# endif
-# define machine_is_kbio9260()	(machine_arch_type == MACH_TYPE_KBIO9260)
-#else
-# define machine_is_kbio9260()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GINZA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GINZA
-# endif
-# define machine_is_ginza()	(machine_arch_type == MACH_TYPE_GINZA)
-#else
-# define machine_is_ginza()	(0)
-#endif
-
-#ifdef CONFIG_MACH_A636N
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_A636N
-# endif
-# define machine_is_a636n()	(machine_arch_type == MACH_TYPE_A636N)
-#else
-# define machine_is_a636n()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IMX27IPCAM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IMX27IPCAM
-# endif
-# define machine_is_imx27ipcam()	(machine_arch_type == MACH_TYPE_IMX27IPCAM)
-#else
-# define machine_is_imx27ipcam()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NEMOC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NEMOC
-# endif
-# define machine_is_nemoc()	(machine_arch_type == MACH_TYPE_NEMOC)
-#else
-# define machine_is_nemoc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GENEVA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GENEVA
-# endif
-# define machine_is_geneva()	(machine_arch_type == MACH_TYPE_GENEVA)
-#else
-# define machine_is_geneva()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCPHAROS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCPHAROS
-# endif
-# define machine_is_htcpharos()	(machine_arch_type == MACH_TYPE_HTCPHAROS)
-#else
-# define machine_is_htcpharos()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NEONC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NEONC
-# endif
-# define machine_is_neonc()	(machine_arch_type == MACH_TYPE_NEONC)
-#else
-# define machine_is_neonc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NAS7100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NAS7100
-# endif
-# define machine_is_nas7100()	(machine_arch_type == MACH_TYPE_NAS7100)
-#else
-# define machine_is_nas7100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TEUPHONE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TEUPHONE
-# endif
-# define machine_is_teuphone()	(machine_arch_type == MACH_TYPE_TEUPHONE)
-#else
-# define machine_is_teuphone()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ANNAX_ETH2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ANNAX_ETH2
-# endif
-# define machine_is_annax_eth2()	(machine_arch_type == MACH_TYPE_ANNAX_ETH2)
-#else
-# define machine_is_annax_eth2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CSB733
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CSB733
-# endif
-# define machine_is_csb733()	(machine_arch_type == MACH_TYPE_CSB733)
-#else
-# define machine_is_csb733()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BK3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BK3
-# endif
-# define machine_is_bk3()	(machine_arch_type == MACH_TYPE_BK3)
-#else
-# define machine_is_bk3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_EM32
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_EM32
-# endif
-# define machine_is_omap_em32()	(machine_arch_type == MACH_TYPE_OMAP_EM32)
-#else
-# define machine_is_omap_em32()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ET9261CP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ET9261CP
-# endif
-# define machine_is_et9261cp()	(machine_arch_type == MACH_TYPE_ET9261CP)
-#else
-# define machine_is_et9261cp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_JASPERC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_JASPERC
-# endif
-# define machine_is_jasperc()	(machine_arch_type == MACH_TYPE_JASPERC)
-#else
-# define machine_is_jasperc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ISSI_ARM9
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ISSI_ARM9
-# endif
-# define machine_is_issi_arm9()	(machine_arch_type == MACH_TYPE_ISSI_ARM9)
-#else
-# define machine_is_issi_arm9()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UED
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UED
-# endif
-# define machine_is_ued()	(machine_arch_type == MACH_TYPE_UED)
-#else
-# define machine_is_ued()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ESIBLADE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ESIBLADE
-# endif
-# define machine_is_esiblade()	(machine_arch_type == MACH_TYPE_ESIBLADE)
-#else
-# define machine_is_esiblade()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EYE02
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EYE02
-# endif
-# define machine_is_eye02()	(machine_arch_type == MACH_TYPE_EYE02)
-#else
-# define machine_is_eye02()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IMX27KBD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IMX27KBD
-# endif
-# define machine_is_imx27kbd()	(machine_arch_type == MACH_TYPE_IMX27KBD)
-#else
-# define machine_is_imx27kbd()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SST61VC010_FPGA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SST61VC010_FPGA
-# endif
-# define machine_is_sst61vc010_fpga()	(machine_arch_type == MACH_TYPE_SST61VC010_FPGA)
-#else
-# define machine_is_sst61vc010_fpga()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KIXVP435
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KIXVP435
-# endif
-# define machine_is_kixvp435()	(machine_arch_type == MACH_TYPE_KIXVP435)
-#else
-# define machine_is_kixvp435()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KIXNP435
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KIXNP435
-# endif
-# define machine_is_kixnp435()	(machine_arch_type == MACH_TYPE_KIXNP435)
-#else
-# define machine_is_kixnp435()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AFRICA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AFRICA
-# endif
-# define machine_is_africa()	(machine_arch_type == MACH_TYPE_AFRICA)
-#else
-# define machine_is_africa()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NH233
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NH233
-# endif
-# define machine_is_nh233()	(machine_arch_type == MACH_TYPE_NH233)
-#else
-# define machine_is_nh233()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RD88F6183AP_GE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RD88F6183AP_GE
-# endif
-# define machine_is_rd88f6183ap_ge()	(machine_arch_type == MACH_TYPE_RD88F6183AP_GE)
-#else
-# define machine_is_rd88f6183ap_ge()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BCM4760
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BCM4760
-# endif
-# define machine_is_bcm4760()	(machine_arch_type == MACH_TYPE_BCM4760)
-#else
-# define machine_is_bcm4760()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EDDY_V2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EDDY_V2
-# endif
-# define machine_is_eddy_v2()	(machine_arch_type == MACH_TYPE_EDDY_V2)
-#else
-# define machine_is_eddy_v2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_REALVIEW_PBA8
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_REALVIEW_PBA8
-# endif
-# define machine_is_realview_pba8()	(machine_arch_type == MACH_TYPE_REALVIEW_PBA8)
-#else
-# define machine_is_realview_pba8()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HID_A7
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HID_A7
-# endif
-# define machine_is_hid_a7()	(machine_arch_type == MACH_TYPE_HID_A7)
-#else
-# define machine_is_hid_a7()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HERO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HERO
-# endif
-# define machine_is_hero()	(machine_arch_type == MACH_TYPE_HERO)
-#else
-# define machine_is_hero()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_POSEIDON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_POSEIDON
-# endif
-# define machine_is_omap_poseidon()	(machine_arch_type == MACH_TYPE_OMAP_POSEIDON)
-#else
-# define machine_is_omap_poseidon()	(0)
-#endif
-
-#ifdef CONFIG_MACH_REALVIEW_PBX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_REALVIEW_PBX
-# endif
-# define machine_is_realview_pbx()	(machine_arch_type == MACH_TYPE_REALVIEW_PBX)
-#else
-# define machine_is_realview_pbx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MICRO9S
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MICRO9S
-# endif
-# define machine_is_micro9s()	(machine_arch_type == MACH_TYPE_MICRO9S)
-#else
-# define machine_is_micro9s()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MAKO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MAKO
-# endif
-# define machine_is_mako()	(machine_arch_type == MACH_TYPE_MAKO)
-#else
-# define machine_is_mako()	(0)
-#endif
-
-#ifdef CONFIG_MACH_XDAFLAME
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XDAFLAME
-# endif
-# define machine_is_xdaflame()	(machine_arch_type == MACH_TYPE_XDAFLAME)
-#else
-# define machine_is_xdaflame()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PHIDGET_SBC2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PHIDGET_SBC2
-# endif
-# define machine_is_phidget_sbc2()	(machine_arch_type == MACH_TYPE_PHIDGET_SBC2)
-#else
-# define machine_is_phidget_sbc2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LIMESTONE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LIMESTONE
-# endif
-# define machine_is_limestone()	(machine_arch_type == MACH_TYPE_LIMESTONE)
-#else
-# define machine_is_limestone()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IPROBE_C32
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IPROBE_C32
-# endif
-# define machine_is_iprobe_c32()	(machine_arch_type == MACH_TYPE_IPROBE_C32)
-#else
-# define machine_is_iprobe_c32()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RUT100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RUT100
-# endif
-# define machine_is_rut100()	(machine_arch_type == MACH_TYPE_RUT100)
-#else
-# define machine_is_rut100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ASUSP535
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ASUSP535
-# endif
-# define machine_is_asusp535()	(machine_arch_type == MACH_TYPE_ASUSP535)
-#else
-# define machine_is_asusp535()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCRAPHAEL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCRAPHAEL
-# endif
-# define machine_is_htcraphael()	(machine_arch_type == MACH_TYPE_HTCRAPHAEL)
-#else
-# define machine_is_htcraphael()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SYGDG1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SYGDG1
-# endif
-# define machine_is_sygdg1()	(machine_arch_type == MACH_TYPE_SYGDG1)
-#else
-# define machine_is_sygdg1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SYGDG2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SYGDG2
-# endif
-# define machine_is_sygdg2()	(machine_arch_type == MACH_TYPE_SYGDG2)
-#else
-# define machine_is_sygdg2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SEOUL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SEOUL
-# endif
-# define machine_is_seoul()	(machine_arch_type == MACH_TYPE_SEOUL)
-#else
-# define machine_is_seoul()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SALERNO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SALERNO
-# endif
-# define machine_is_salerno()	(machine_arch_type == MACH_TYPE_SALERNO)
-#else
-# define machine_is_salerno()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UCN_S3C64XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UCN_S3C64XX
-# endif
-# define machine_is_ucn_s3c64xx()	(machine_arch_type == MACH_TYPE_UCN_S3C64XX)
-#else
-# define machine_is_ucn_s3c64xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MSM7201A
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MSM7201A
-# endif
-# define machine_is_msm7201a()	(machine_arch_type == MACH_TYPE_MSM7201A)
-#else
-# define machine_is_msm7201a()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LPR1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LPR1
-# endif
-# define machine_is_lpr1()	(machine_arch_type == MACH_TYPE_LPR1)
-#else
-# define machine_is_lpr1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARMADILLO500FX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARMADILLO500FX
-# endif
-# define machine_is_armadillo500fx()	(machine_arch_type == MACH_TYPE_ARMADILLO500FX)
-#else
-# define machine_is_armadillo500fx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_G3EVM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_G3EVM
-# endif
-# define machine_is_g3evm()	(machine_arch_type == MACH_TYPE_G3EVM)
-#else
-# define machine_is_g3evm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_Z3_DM355
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_Z3_DM355
-# endif
-# define machine_is_z3_dm355()	(machine_arch_type == MACH_TYPE_Z3_DM355)
-#else
-# define machine_is_z3_dm355()	(0)
-#endif
-
-#ifdef CONFIG_MACH_W90P910EVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_W90P910EVB
-# endif
-# define machine_is_w90p910evb()	(machine_arch_type == MACH_TYPE_W90P910EVB)
-#else
-# define machine_is_w90p910evb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_W90P920EVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_W90P920EVB
-# endif
-# define machine_is_w90p920evb()	(machine_arch_type == MACH_TYPE_W90P920EVB)
-#else
-# define machine_is_w90p920evb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_W90P950EVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_W90P950EVB
-# endif
-# define machine_is_w90p950evb()	(machine_arch_type == MACH_TYPE_W90P950EVB)
-#else
-# define machine_is_w90p950evb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_W90N960EVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_W90N960EVB
-# endif
-# define machine_is_w90n960evb()	(machine_arch_type == MACH_TYPE_W90N960EVB)
-#else
-# define machine_is_w90n960evb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CAMHD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CAMHD
-# endif
-# define machine_is_camhd()	(machine_arch_type == MACH_TYPE_CAMHD)
-#else
-# define machine_is_camhd()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MVC100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MVC100
-# endif
-# define machine_is_mvc100()	(machine_arch_type == MACH_TYPE_MVC100)
-#else
-# define machine_is_mvc100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ELECTRUM_200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ELECTRUM_200
-# endif
-# define machine_is_electrum_200()	(machine_arch_type == MACH_TYPE_ELECTRUM_200)
-#else
-# define machine_is_electrum_200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCJADE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCJADE
-# endif
-# define machine_is_htcjade()	(machine_arch_type == MACH_TYPE_HTCJADE)
-#else
-# define machine_is_htcjade()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MEMPHIS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MEMPHIS
-# endif
-# define machine_is_memphis()	(machine_arch_type == MACH_TYPE_MEMPHIS)
-#else
-# define machine_is_memphis()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IMX27SBC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IMX27SBC
-# endif
-# define machine_is_imx27sbc()	(machine_arch_type == MACH_TYPE_IMX27SBC)
-#else
-# define machine_is_imx27sbc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LEXTAR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LEXTAR
-# endif
-# define machine_is_lextar()	(machine_arch_type == MACH_TYPE_LEXTAR)
-#else
-# define machine_is_lextar()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MV88F6281GTW_GE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MV88F6281GTW_GE
-# endif
-# define machine_is_mv88f6281gtw_ge()	(machine_arch_type == MACH_TYPE_MV88F6281GTW_GE)
-#else
-# define machine_is_mv88f6281gtw_ge()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NCP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NCP
-# endif
-# define machine_is_ncp()	(machine_arch_type == MACH_TYPE_NCP)
-#else
-# define machine_is_ncp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_Z32AN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_Z32AN
-# endif
-# define machine_is_z32an_series()	(machine_arch_type == MACH_TYPE_Z32AN)
-#else
-# define machine_is_z32an_series()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TMQ_CAPD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TMQ_CAPD
-# endif
-# define machine_is_tmq_capd()	(machine_arch_type == MACH_TYPE_TMQ_CAPD)
-#else
-# define machine_is_tmq_capd()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_WL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP3_WL
-# endif
-# define machine_is_omap3_wl()	(machine_arch_type == MACH_TYPE_OMAP3_WL)
-#else
-# define machine_is_omap3_wl()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CHUMBY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CHUMBY
-# endif
-# define machine_is_chumby()	(machine_arch_type == MACH_TYPE_CHUMBY)
-#else
-# define machine_is_chumby()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ATSARM9
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ATSARM9
-# endif
-# define machine_is_atsarm9()	(machine_arch_type == MACH_TYPE_ATSARM9)
-#else
-# define machine_is_atsarm9()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_DM365_EVM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DAVINCI_DM365_EVM
-# endif
-# define machine_is_davinci_dm365_evm()	(machine_arch_type == MACH_TYPE_DAVINCI_DM365_EVM)
-#else
-# define machine_is_davinci_dm365_evm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BAHAMAS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BAHAMAS
-# endif
-# define machine_is_bahamas()	(machine_arch_type == MACH_TYPE_BAHAMAS)
-#else
-# define machine_is_bahamas()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DAS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DAS
-# endif
-# define machine_is_das()	(machine_arch_type == MACH_TYPE_DAS)
-#else
-# define machine_is_das()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MINIDAS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MINIDAS
-# endif
-# define machine_is_minidas()	(machine_arch_type == MACH_TYPE_MINIDAS)
-#else
-# define machine_is_minidas()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VK1000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VK1000
-# endif
-# define machine_is_vk1000()	(machine_arch_type == MACH_TYPE_VK1000)
-#else
-# define machine_is_vk1000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CENTRO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CENTRO
-# endif
-# define machine_is_centro()	(machine_arch_type == MACH_TYPE_CENTRO)
-#else
-# define machine_is_centro()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CTERA_2BAY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CTERA_2BAY
-# endif
-# define machine_is_ctera_2bay()	(machine_arch_type == MACH_TYPE_CTERA_2BAY)
-#else
-# define machine_is_ctera_2bay()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EDGECONNECT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EDGECONNECT
-# endif
-# define machine_is_edgeconnect()	(machine_arch_type == MACH_TYPE_EDGECONNECT)
-#else
-# define machine_is_edgeconnect()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ND27000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ND27000
-# endif
-# define machine_is_nd27000()	(machine_arch_type == MACH_TYPE_ND27000)
-#else
-# define machine_is_nd27000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GEMALTO_COBRA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GEMALTO_COBRA
-# endif
-# define machine_is_cobra()	(machine_arch_type == MACH_TYPE_GEMALTO_COBRA)
-#else
-# define machine_is_cobra()	(0)
-#endif
-
-#ifdef CONFIG_MACH_INGELABS_COMET
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_INGELABS_COMET
-# endif
-# define machine_is_ingelabs_comet()	(machine_arch_type == MACH_TYPE_INGELABS_COMET)
-#else
-# define machine_is_ingelabs_comet()	(0)
-#endif
-
-#ifdef CONFIG_MACH_POLLUX_WIZ
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_POLLUX_WIZ
-# endif
-# define machine_is_pollux_wiz()	(machine_arch_type == MACH_TYPE_POLLUX_WIZ)
-#else
-# define machine_is_pollux_wiz()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BLACKSTONE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BLACKSTONE
-# endif
-# define machine_is_blackstone()	(machine_arch_type == MACH_TYPE_BLACKSTONE)
-#else
-# define machine_is_blackstone()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TOPAZ
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TOPAZ
-# endif
-# define machine_is_topaz()	(machine_arch_type == MACH_TYPE_TOPAZ)
-#else
-# define machine_is_topaz()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AIXLE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AIXLE
-# endif
-# define machine_is_aixle()	(machine_arch_type == MACH_TYPE_AIXLE)
-#else
-# define machine_is_aixle()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MW998
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MW998
-# endif
-# define machine_is_mw998()	(machine_arch_type == MACH_TYPE_MW998)
-#else
-# define machine_is_mw998()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NOKIA_RX51
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NOKIA_RX51
-# endif
-# define machine_is_nokia_rx51()	(machine_arch_type == MACH_TYPE_NOKIA_RX51)
-#else
-# define machine_is_nokia_rx51()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VSC5605EV
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VSC5605EV
-# endif
-# define machine_is_vsc5605ev()	(machine_arch_type == MACH_TYPE_VSC5605EV)
-#else
-# define machine_is_vsc5605ev()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NT98700DK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NT98700DK
-# endif
-# define machine_is_nt98700dk()	(machine_arch_type == MACH_TYPE_NT98700DK)
-#else
-# define machine_is_nt98700dk()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ICONTACT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ICONTACT
-# endif
-# define machine_is_icontact()	(machine_arch_type == MACH_TYPE_ICONTACT)
-#else
-# define machine_is_icontact()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SWARCO_FRCPU
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SWARCO_FRCPU
-# endif
-# define machine_is_swarco_frcpu()	(machine_arch_type == MACH_TYPE_SWARCO_FRCPU)
-#else
-# define machine_is_swarco_frcpu()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SWARCO_SCPU
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SWARCO_SCPU
-# endif
-# define machine_is_swarco_scpu()	(machine_arch_type == MACH_TYPE_SWARCO_SCPU)
-#else
-# define machine_is_swarco_scpu()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BBOX_P16
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BBOX_P16
-# endif
-# define machine_is_bbox_p16()	(machine_arch_type == MACH_TYPE_BBOX_P16)
-#else
-# define machine_is_bbox_p16()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BSTD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BSTD
-# endif
-# define machine_is_bstd()	(machine_arch_type == MACH_TYPE_BSTD)
-#else
-# define machine_is_bstd()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SBC2440II
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SBC2440II
-# endif
-# define machine_is_sbc2440ii()	(machine_arch_type == MACH_TYPE_SBC2440II)
-#else
-# define machine_is_sbc2440ii()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PCM034
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PCM034
-# endif
-# define machine_is_pcm034()	(machine_arch_type == MACH_TYPE_PCM034)
-#else
-# define machine_is_pcm034()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NESO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NESO
-# endif
-# define machine_is_neso()	(machine_arch_type == MACH_TYPE_NESO)
-#else
-# define machine_is_neso()	(0)
-#endif
-
-#ifdef CONFIG_MACH_WLNX_9G20
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WLNX_9G20
-# endif
-# define machine_is_wlnx_9g20()	(machine_arch_type == MACH_TYPE_WLNX_9G20)
-#else
-# define machine_is_wlnx_9g20()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_ZOOM2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_ZOOM2
-# endif
-# define machine_is_omap_zoom2()	(machine_arch_type == MACH_TYPE_OMAP_ZOOM2)
-#else
-# define machine_is_omap_zoom2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TOTEMNOVA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TOTEMNOVA
-# endif
-# define machine_is_totemnova()	(machine_arch_type == MACH_TYPE_TOTEMNOVA)
-#else
-# define machine_is_totemnova()	(0)
-#endif
-
-#ifdef CONFIG_MACH_C5000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_C5000
-# endif
-# define machine_is_c5000()	(machine_arch_type == MACH_TYPE_C5000)
-#else
-# define machine_is_c5000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UNIPO_AT91SAM9263
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UNIPO_AT91SAM9263
-# endif
-# define machine_is_unipo_at91sam9263()	(machine_arch_type == MACH_TYPE_UNIPO_AT91SAM9263)
-#else
-# define machine_is_unipo_at91sam9263()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ETHERNUT5
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ETHERNUT5
-# endif
-# define machine_is_ethernut5()	(machine_arch_type == MACH_TYPE_ETHERNUT5)
-#else
-# define machine_is_ethernut5()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARM11
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARM11
-# endif
-# define machine_is_arm11()	(machine_arch_type == MACH_TYPE_ARM11)
-#else
-# define machine_is_arm11()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CPUAT9260
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CPUAT9260
-# endif
-# define machine_is_cpuat9260()	(machine_arch_type == MACH_TYPE_CPUAT9260)
-#else
-# define machine_is_cpuat9260()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CPUPXA255
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CPUPXA255
-# endif
-# define machine_is_cpupxa255()	(machine_arch_type == MACH_TYPE_CPUPXA255)
-#else
-# define machine_is_cpupxa255()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CPUIMX27
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CPUIMX27
-# endif
-# define machine_is_eukrea_cpuimx27()	(machine_arch_type == MACH_TYPE_CPUIMX27)
-#else
-# define machine_is_eukrea_cpuimx27()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CHEFLUX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CHEFLUX
-# endif
-# define machine_is_cheflux()	(machine_arch_type == MACH_TYPE_CHEFLUX)
-#else
-# define machine_is_cheflux()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EB_CPUX9K2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EB_CPUX9K2
-# endif
-# define machine_is_eb_cpux9k2()	(machine_arch_type == MACH_TYPE_EB_CPUX9K2)
-#else
-# define machine_is_eb_cpux9k2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OPCOTEC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OPCOTEC
-# endif
-# define machine_is_opcotec()	(machine_arch_type == MACH_TYPE_OPCOTEC)
-#else
-# define machine_is_opcotec()	(0)
-#endif
-
-#ifdef CONFIG_MACH_YT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_YT
-# endif
-# define machine_is_yt()	(machine_arch_type == MACH_TYPE_YT)
-#else
-# define machine_is_yt()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MOTOQ
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MOTOQ
-# endif
-# define machine_is_motoq()	(machine_arch_type == MACH_TYPE_MOTOQ)
-#else
-# define machine_is_motoq()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BSB1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BSB1
-# endif
-# define machine_is_bsb1()	(machine_arch_type == MACH_TYPE_BSB1)
-#else
-# define machine_is_bsb1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ACS5K
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ACS5K
-# endif
-# define machine_is_acs5k()	(machine_arch_type == MACH_TYPE_ACS5K)
-#else
-# define machine_is_acs5k()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MILAN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MILAN
-# endif
-# define machine_is_milan()	(machine_arch_type == MACH_TYPE_MILAN)
-#else
-# define machine_is_milan()	(0)
-#endif
-
-#ifdef CONFIG_MACH_QUARTZV2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_QUARTZV2
-# endif
-# define machine_is_quartzv2()	(machine_arch_type == MACH_TYPE_QUARTZV2)
-#else
-# define machine_is_quartzv2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RSVP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RSVP
-# endif
-# define machine_is_rsvp()	(machine_arch_type == MACH_TYPE_RSVP)
-#else
-# define machine_is_rsvp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RMP200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RMP200
-# endif
-# define machine_is_rmp200()	(machine_arch_type == MACH_TYPE_RMP200)
-#else
-# define machine_is_rmp200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SNAPPER_9260
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SNAPPER_9260
-# endif
-# define machine_is_snapper_9260()	(machine_arch_type == MACH_TYPE_SNAPPER_9260)
-#else
-# define machine_is_snapper_9260()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DSM320
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DSM320
-# endif
-# define machine_is_dsm320()	(machine_arch_type == MACH_TYPE_DSM320)
-#else
-# define machine_is_dsm320()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ADSGCM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADSGCM
-# endif
-# define machine_is_adsgcm()	(machine_arch_type == MACH_TYPE_ADSGCM)
-#else
-# define machine_is_adsgcm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ASE2_400
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ASE2_400
-# endif
-# define machine_is_ase2_400()	(machine_arch_type == MACH_TYPE_ASE2_400)
-#else
-# define machine_is_ase2_400()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PIZZA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PIZZA
-# endif
-# define machine_is_pizza()	(machine_arch_type == MACH_TYPE_PIZZA)
-#else
-# define machine_is_pizza()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SPOT_NGPL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SPOT_NGPL
-# endif
-# define machine_is_spot_ngpl()	(machine_arch_type == MACH_TYPE_SPOT_NGPL)
-#else
-# define machine_is_spot_ngpl()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARMATA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARMATA
-# endif
-# define machine_is_armata()	(machine_arch_type == MACH_TYPE_ARMATA)
-#else
-# define machine_is_armata()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EXEDA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EXEDA
-# endif
-# define machine_is_exeda()	(machine_arch_type == MACH_TYPE_EXEDA)
-#else
-# define machine_is_exeda()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX31SF005
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX31SF005
-# endif
-# define machine_is_mx31sf005()	(machine_arch_type == MACH_TYPE_MX31SF005)
-#else
-# define machine_is_mx31sf005()	(0)
-#endif
-
-#ifdef CONFIG_MACH_F5D8231_4_V2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_F5D8231_4_V2
-# endif
-# define machine_is_f5d8231_4_v2()	(machine_arch_type == MACH_TYPE_F5D8231_4_V2)
-#else
-# define machine_is_f5d8231_4_v2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_Q2440
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_Q2440
-# endif
-# define machine_is_q2440()	(machine_arch_type == MACH_TYPE_Q2440)
-#else
-# define machine_is_q2440()	(0)
-#endif
-
-#ifdef CONFIG_MACH_QQ2440
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_QQ2440
-# endif
-# define machine_is_qq2440()	(machine_arch_type == MACH_TYPE_QQ2440)
-#else
-# define machine_is_qq2440()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MINI2440
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MINI2440
-# endif
-# define machine_is_mini2440()	(machine_arch_type == MACH_TYPE_MINI2440)
-#else
-# define machine_is_mini2440()	(0)
-#endif
-
-#ifdef CONFIG_MACH_COLIBRI300
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_COLIBRI300
-# endif
-# define machine_is_colibri300()	(machine_arch_type == MACH_TYPE_COLIBRI300)
-#else
-# define machine_is_colibri300()	(0)
-#endif
-
-#ifdef CONFIG_MACH_JADES
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_JADES
-# endif
-# define machine_is_jades()	(machine_arch_type == MACH_TYPE_JADES)
-#else
-# define machine_is_jades()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SPARK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SPARK
-# endif
-# define machine_is_spark()	(machine_arch_type == MACH_TYPE_SPARK)
-#else
-# define machine_is_spark()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BENZINA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BENZINA
-# endif
-# define machine_is_benzina()	(machine_arch_type == MACH_TYPE_BENZINA)
-#else
-# define machine_is_benzina()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BLAZE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BLAZE
-# endif
-# define machine_is_blaze()	(machine_arch_type == MACH_TYPE_BLAZE)
-#else
-# define machine_is_blaze()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LINKSTATION_LS_HGL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LINKSTATION_LS_HGL
-# endif
-# define machine_is_linkstation_ls_hgl()	(machine_arch_type == MACH_TYPE_LINKSTATION_LS_HGL)
-#else
-# define machine_is_linkstation_ls_hgl()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCVENUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCVENUS
-# endif
-# define machine_is_htckovsky()	(machine_arch_type == MACH_TYPE_HTCVENUS)
-#else
-# define machine_is_htckovsky()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SONY_PRS505
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SONY_PRS505
-# endif
-# define machine_is_sony_prs505()	(machine_arch_type == MACH_TYPE_SONY_PRS505)
-#else
-# define machine_is_sony_prs505()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HANLIN_V3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HANLIN_V3
-# endif
-# define machine_is_hanlin_v3()	(machine_arch_type == MACH_TYPE_HANLIN_V3)
-#else
-# define machine_is_hanlin_v3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SAPPHIRA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SAPPHIRA
-# endif
-# define machine_is_sapphira()	(machine_arch_type == MACH_TYPE_SAPPHIRA)
-#else
-# define machine_is_sapphira()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DACK_SDA_01
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DACK_SDA_01
-# endif
-# define machine_is_dack_sda_01()	(machine_arch_type == MACH_TYPE_DACK_SDA_01)
-#else
-# define machine_is_dack_sda_01()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARMBOX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARMBOX
-# endif
-# define machine_is_armbox()	(machine_arch_type == MACH_TYPE_ARMBOX)
-#else
-# define machine_is_armbox()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HARRIS_RVP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HARRIS_RVP
-# endif
-# define machine_is_harris_rvp()	(machine_arch_type == MACH_TYPE_HARRIS_RVP)
-#else
-# define machine_is_harris_rvp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RIBALDO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RIBALDO
-# endif
-# define machine_is_ribaldo()	(machine_arch_type == MACH_TYPE_RIBALDO)
-#else
-# define machine_is_ribaldo()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AGORA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AGORA
-# endif
-# define machine_is_agora()	(machine_arch_type == MACH_TYPE_AGORA)
-#else
-# define machine_is_agora()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_MINI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP3_MINI
-# endif
-# define machine_is_omap3_mini()	(machine_arch_type == MACH_TYPE_OMAP3_MINI)
-#else
-# define machine_is_omap3_mini()	(0)
-#endif
-
-#ifdef CONFIG_MACH_A9SAM6432_B
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_A9SAM6432_B
-# endif
-# define machine_is_a9sam6432_b()	(machine_arch_type == MACH_TYPE_A9SAM6432_B)
-#else
-# define machine_is_a9sam6432_b()	(0)
-#endif
-
-#ifdef CONFIG_MACH_USG2410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_USG2410
-# endif
-# define machine_is_usg2410()	(machine_arch_type == MACH_TYPE_USG2410)
-#else
-# define machine_is_usg2410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PC72052_I10_REVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PC72052_I10_REVB
-# endif
-# define machine_is_pc72052_i10_revb()	(machine_arch_type == MACH_TYPE_PC72052_I10_REVB)
-#else
-# define machine_is_pc72052_i10_revb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX35_EXM32
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX35_EXM32
-# endif
-# define machine_is_mx35_exm32()	(machine_arch_type == MACH_TYPE_MX35_EXM32)
-#else
-# define machine_is_mx35_exm32()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TOPAS910
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TOPAS910
-# endif
-# define machine_is_topas910()	(machine_arch_type == MACH_TYPE_TOPAS910)
-#else
-# define machine_is_topas910()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HYENA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HYENA
-# endif
-# define machine_is_hyena()	(machine_arch_type == MACH_TYPE_HYENA)
-#else
-# define machine_is_hyena()	(0)
-#endif
-
-#ifdef CONFIG_MACH_POSPAX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_POSPAX
-# endif
-# define machine_is_pospax()	(machine_arch_type == MACH_TYPE_POSPAX)
-#else
-# define machine_is_pospax()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HDL_GX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HDL_GX
-# endif
-# define machine_is_hdl_gx()	(machine_arch_type == MACH_TYPE_HDL_GX)
-#else
-# define machine_is_hdl_gx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CTERA_4BAY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CTERA_4BAY
-# endif
-# define machine_is_ctera_4bay()	(machine_arch_type == MACH_TYPE_CTERA_4BAY)
-#else
-# define machine_is_ctera_4bay()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CTERA_PLUG_C
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CTERA_PLUG_C
-# endif
-# define machine_is_ctera_plug_c()	(machine_arch_type == MACH_TYPE_CTERA_PLUG_C)
-#else
-# define machine_is_ctera_plug_c()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CRWEA_PLUG_I
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CRWEA_PLUG_I
-# endif
-# define machine_is_crwea_plug_i()	(machine_arch_type == MACH_TYPE_CRWEA_PLUG_I)
-#else
-# define machine_is_crwea_plug_i()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EGAUGE2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EGAUGE2
-# endif
-# define machine_is_egauge2()	(machine_arch_type == MACH_TYPE_EGAUGE2)
-#else
-# define machine_is_egauge2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DIDJ
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DIDJ
-# endif
-# define machine_is_didj()	(machine_arch_type == MACH_TYPE_DIDJ)
-#else
-# define machine_is_didj()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MEISTER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MEISTER
-# endif
-# define machine_is_m_s3c2443()	(machine_arch_type == MACH_TYPE_MEISTER)
-#else
-# define machine_is_m_s3c2443()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCBLACKSTONE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCBLACKSTONE
-# endif
-# define machine_is_htcblackstone()	(machine_arch_type == MACH_TYPE_HTCBLACKSTONE)
-#else
-# define machine_is_htcblackstone()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CPUAT9G20
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CPUAT9G20
-# endif
-# define machine_is_cpuat9g20()	(machine_arch_type == MACH_TYPE_CPUAT9G20)
-#else
-# define machine_is_cpuat9g20()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK6440
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMDK6440
-# endif
-# define machine_is_smdk6440()	(machine_arch_type == MACH_TYPE_SMDK6440)
-#else
-# define machine_is_smdk6440()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_35XX_MVP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_35XX_MVP
-# endif
-# define machine_is_omap_35xx_mvp()	(machine_arch_type == MACH_TYPE_OMAP_35XX_MVP)
-#else
-# define machine_is_omap_35xx_mvp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CTERA_PLUG_I
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CTERA_PLUG_I
-# endif
-# define machine_is_ctera_plug_i()	(machine_arch_type == MACH_TYPE_CTERA_PLUG_I)
-#else
-# define machine_is_ctera_plug_i()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PVG610
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PVG610
-# endif
-# define machine_is_pvg610_100()	(machine_arch_type == MACH_TYPE_PVG610)
-#else
-# define machine_is_pvg610_100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HPRW6815
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HPRW6815
-# endif
-# define machine_is_hprw6815()	(machine_arch_type == MACH_TYPE_HPRW6815)
-#else
-# define machine_is_hprw6815()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_OSWALD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP3_OSWALD
-# endif
-# define machine_is_omap3_oswald()	(machine_arch_type == MACH_TYPE_OMAP3_OSWALD)
-#else
-# define machine_is_omap3_oswald()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NAS4220B
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NAS4220B
-# endif
-# define machine_is_nas4220b()	(machine_arch_type == MACH_TYPE_NAS4220B)
-#else
-# define machine_is_nas4220b()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCRAPHAEL_CDMA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCRAPHAEL_CDMA
-# endif
-# define machine_is_htcraphael_cdma()	(machine_arch_type == MACH_TYPE_HTCRAPHAEL_CDMA)
-#else
-# define machine_is_htcraphael_cdma()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCDIAMOND_CDMA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCDIAMOND_CDMA
-# endif
-# define machine_is_htcdiamond_cdma()	(machine_arch_type == MACH_TYPE_HTCDIAMOND_CDMA)
-#else
-# define machine_is_htcdiamond_cdma()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SCALER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SCALER
-# endif
-# define machine_is_scaler()	(machine_arch_type == MACH_TYPE_SCALER)
-#else
-# define machine_is_scaler()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZYLONITE2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZYLONITE2
-# endif
-# define machine_is_zylonite2()	(machine_arch_type == MACH_TYPE_ZYLONITE2)
-#else
-# define machine_is_zylonite2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ASPENITE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ASPENITE
-# endif
-# define machine_is_aspenite()	(machine_arch_type == MACH_TYPE_ASPENITE)
-#else
-# define machine_is_aspenite()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TETON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TETON
-# endif
-# define machine_is_teton()	(machine_arch_type == MACH_TYPE_TETON)
-#else
-# define machine_is_teton()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TTC_DKB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TTC_DKB
-# endif
-# define machine_is_ttc_dkb()	(machine_arch_type == MACH_TYPE_TTC_DKB)
-#else
-# define machine_is_ttc_dkb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BISHOP2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BISHOP2
-# endif
-# define machine_is_bishop2()	(machine_arch_type == MACH_TYPE_BISHOP2)
-#else
-# define machine_is_bishop2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IPPV5
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IPPV5
-# endif
-# define machine_is_ippv5()	(machine_arch_type == MACH_TYPE_IPPV5)
-#else
-# define machine_is_ippv5()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FARM926
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FARM926
-# endif
-# define machine_is_farm926()	(machine_arch_type == MACH_TYPE_FARM926)
-#else
-# define machine_is_farm926()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MMCCPU
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MMCCPU
-# endif
-# define machine_is_mmccpu()	(machine_arch_type == MACH_TYPE_MMCCPU)
-#else
-# define machine_is_mmccpu()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SGMSFL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SGMSFL
-# endif
-# define machine_is_sgmsfl()	(machine_arch_type == MACH_TYPE_SGMSFL)
-#else
-# define machine_is_sgmsfl()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TT8000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TT8000
-# endif
-# define machine_is_tt8000()	(machine_arch_type == MACH_TYPE_TT8000)
-#else
-# define machine_is_tt8000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZRN4300LP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZRN4300LP
-# endif
-# define machine_is_zrn4300lp()	(machine_arch_type == MACH_TYPE_ZRN4300LP)
-#else
-# define machine_is_zrn4300lp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MPTC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MPTC
-# endif
-# define machine_is_mptc()	(machine_arch_type == MACH_TYPE_MPTC)
-#else
-# define machine_is_mptc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_H6051
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_H6051
-# endif
-# define machine_is_h6051()	(machine_arch_type == MACH_TYPE_H6051)
-#else
-# define machine_is_h6051()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PVG610_101
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PVG610_101
-# endif
-# define machine_is_pvg610_101()	(machine_arch_type == MACH_TYPE_PVG610_101)
-#else
-# define machine_is_pvg610_101()	(0)
-#endif
-
-#ifdef CONFIG_MACH_STAMP9261_PC_EVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STAMP9261_PC_EVB
-# endif
-# define machine_is_stamp9261_pc_evb()	(machine_arch_type == MACH_TYPE_STAMP9261_PC_EVB)
-#else
-# define machine_is_stamp9261_pc_evb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PELCO_ODYSSEUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PELCO_ODYSSEUS
-# endif
-# define machine_is_pelco_odysseus()	(machine_arch_type == MACH_TYPE_PELCO_ODYSSEUS)
-#else
-# define machine_is_pelco_odysseus()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TNY_A9260
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TNY_A9260
-# endif
-# define machine_is_tny_a9260()	(machine_arch_type == MACH_TYPE_TNY_A9260)
-#else
-# define machine_is_tny_a9260()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TNY_A9G20
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TNY_A9G20
-# endif
-# define machine_is_tny_a9g20()	(machine_arch_type == MACH_TYPE_TNY_A9G20)
-#else
-# define machine_is_tny_a9g20()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AESOP_MP2530F
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AESOP_MP2530F
-# endif
-# define machine_is_aesop_mp2530f()	(machine_arch_type == MACH_TYPE_AESOP_MP2530F)
-#else
-# define machine_is_aesop_mp2530f()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DX900
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DX900
-# endif
-# define machine_is_dx900()	(machine_arch_type == MACH_TYPE_DX900)
-#else
-# define machine_is_dx900()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CPODC2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CPODC2
-# endif
-# define machine_is_cpodc2()	(machine_arch_type == MACH_TYPE_CPODC2)
-#else
-# define machine_is_cpodc2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TILT_8925
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TILT_8925
-# endif
-# define machine_is_tilt_8925()	(machine_arch_type == MACH_TYPE_TILT_8925)
-#else
-# define machine_is_tilt_8925()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_DM357_EVM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DAVINCI_DM357_EVM
-# endif
-# define machine_is_davinci_dm357_evm()	(machine_arch_type == MACH_TYPE_DAVINCI_DM357_EVM)
-#else
-# define machine_is_davinci_dm357_evm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SWORDFISH
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SWORDFISH
-# endif
-# define machine_is_swordfish()	(machine_arch_type == MACH_TYPE_SWORDFISH)
-#else
-# define machine_is_swordfish()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CORVUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CORVUS
-# endif
-# define machine_is_corvus()	(machine_arch_type == MACH_TYPE_CORVUS)
-#else
-# define machine_is_corvus()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TAURUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TAURUS
-# endif
-# define machine_is_taurus()	(machine_arch_type == MACH_TYPE_TAURUS)
-#else
-# define machine_is_taurus()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AXM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AXM
-# endif
-# define machine_is_axm()	(machine_arch_type == MACH_TYPE_AXM)
-#else
-# define machine_is_axm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AXC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AXC
-# endif
-# define machine_is_axc()	(machine_arch_type == MACH_TYPE_AXC)
-#else
-# define machine_is_axc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BABY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BABY
-# endif
-# define machine_is_baby()	(machine_arch_type == MACH_TYPE_BABY)
-#else
-# define machine_is_baby()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MP200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MP200
-# endif
-# define machine_is_mp200()	(machine_arch_type == MACH_TYPE_MP200)
-#else
-# define machine_is_mp200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PCM043
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PCM043
-# endif
-# define machine_is_pcm043()	(machine_arch_type == MACH_TYPE_PCM043)
-#else
-# define machine_is_pcm043()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HANLIN_V3C
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HANLIN_V3C
-# endif
-# define machine_is_hanlin_v3c()	(machine_arch_type == MACH_TYPE_HANLIN_V3C)
-#else
-# define machine_is_hanlin_v3c()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KBK9G20
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KBK9G20
-# endif
-# define machine_is_kbk9g20()	(machine_arch_type == MACH_TYPE_KBK9G20)
-#else
-# define machine_is_kbk9g20()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ADSTURBOG5
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ADSTURBOG5
-# endif
-# define machine_is_adsturbog5()	(machine_arch_type == MACH_TYPE_ADSTURBOG5)
-#else
-# define machine_is_adsturbog5()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AVENGER_LITE1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AVENGER_LITE1
-# endif
-# define machine_is_avenger_lite1()	(machine_arch_type == MACH_TYPE_AVENGER_LITE1)
-#else
-# define machine_is_avenger_lite1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SUC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SUC
-# endif
-# define machine_is_suc82x()	(machine_arch_type == MACH_TYPE_SUC)
-#else
-# define machine_is_suc82x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM7S256
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91SAM7S256
-# endif
-# define machine_is_at91sam7s256()	(machine_arch_type == MACH_TYPE_AT91SAM7S256)
-#else
-# define machine_is_at91sam7s256()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MENDOZA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MENDOZA
-# endif
-# define machine_is_mendoza()	(machine_arch_type == MACH_TYPE_MENDOZA)
-#else
-# define machine_is_mendoza()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KIRA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KIRA
-# endif
-# define machine_is_kira()	(machine_arch_type == MACH_TYPE_KIRA)
-#else
-# define machine_is_kira()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX1HBM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX1HBM
-# endif
-# define machine_is_mx1hbm()	(machine_arch_type == MACH_TYPE_MX1HBM)
-#else
-# define machine_is_mx1hbm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_QUATRO43XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_QUATRO43XX
-# endif
-# define machine_is_quatro43xx()	(machine_arch_type == MACH_TYPE_QUATRO43XX)
-#else
-# define machine_is_quatro43xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_QUATRO4230
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_QUATRO4230
-# endif
-# define machine_is_quatro4230()	(machine_arch_type == MACH_TYPE_QUATRO4230)
-#else
-# define machine_is_quatro4230()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NSB400
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NSB400
-# endif
-# define machine_is_nsb400()	(machine_arch_type == MACH_TYPE_NSB400)
-#else
-# define machine_is_nsb400()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DRP255
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DRP255
-# endif
-# define machine_is_drp255()	(machine_arch_type == MACH_TYPE_DRP255)
-#else
-# define machine_is_drp255()	(0)
-#endif
-
-#ifdef CONFIG_MACH_THOTH
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_THOTH
-# endif
-# define machine_is_thoth()	(machine_arch_type == MACH_TYPE_THOTH)
-#else
-# define machine_is_thoth()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FIRESTONE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FIRESTONE
-# endif
-# define machine_is_firestone()	(machine_arch_type == MACH_TYPE_FIRESTONE)
-#else
-# define machine_is_firestone()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ASUSP750
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ASUSP750
-# endif
-# define machine_is_asusp750()	(machine_arch_type == MACH_TYPE_ASUSP750)
-#else
-# define machine_is_asusp750()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CTERA_DL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CTERA_DL
-# endif
-# define machine_is_ctera_dl()	(machine_arch_type == MACH_TYPE_CTERA_DL)
-#else
-# define machine_is_ctera_dl()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SOCR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SOCR
-# endif
-# define machine_is_socr()	(machine_arch_type == MACH_TYPE_SOCR)
-#else
-# define machine_is_socr()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCOXYGEN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCOXYGEN
-# endif
-# define machine_is_htcoxygen()	(machine_arch_type == MACH_TYPE_HTCOXYGEN)
-#else
-# define machine_is_htcoxygen()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HEROC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HEROC
-# endif
-# define machine_is_heroc()	(machine_arch_type == MACH_TYPE_HEROC)
-#else
-# define machine_is_heroc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZENO6800
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZENO6800
-# endif
-# define machine_is_zeno6800()	(machine_arch_type == MACH_TYPE_ZENO6800)
-#else
-# define machine_is_zeno6800()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SC2MCS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SC2MCS
-# endif
-# define machine_is_sc2mcs()	(machine_arch_type == MACH_TYPE_SC2MCS)
-#else
-# define machine_is_sc2mcs()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GENE100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GENE100
-# endif
-# define machine_is_gene100()	(machine_arch_type == MACH_TYPE_GENE100)
-#else
-# define machine_is_gene100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AS353X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AS353X
-# endif
-# define machine_is_as353x()	(machine_arch_type == MACH_TYPE_AS353X)
-#else
-# define machine_is_as353x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SHEEVAPLUG
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SHEEVAPLUG
-# endif
-# define machine_is_sheevaplug()	(machine_arch_type == MACH_TYPE_SHEEVAPLUG)
-#else
-# define machine_is_sheevaplug()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM9G20
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91SAM9G20
-# endif
-# define machine_is_at91sam9g20()	(machine_arch_type == MACH_TYPE_AT91SAM9G20)
-#else
-# define machine_is_at91sam9g20()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MV88F6192GTW_FE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MV88F6192GTW_FE
-# endif
-# define machine_is_mv88f6192gtw_fe()	(machine_arch_type == MACH_TYPE_MV88F6192GTW_FE)
-#else
-# define machine_is_mv88f6192gtw_fe()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CC9200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CC9200
-# endif
-# define machine_is_cc9200()	(machine_arch_type == MACH_TYPE_CC9200)
-#else
-# define machine_is_cc9200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SM9200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SM9200
-# endif
-# define machine_is_sm9200()	(machine_arch_type == MACH_TYPE_SM9200)
-#else
-# define machine_is_sm9200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TP9200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TP9200
-# endif
-# define machine_is_tp9200()	(machine_arch_type == MACH_TYPE_TP9200)
-#else
-# define machine_is_tp9200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SNAPPERDV
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SNAPPERDV
-# endif
-# define machine_is_snapperdv()	(machine_arch_type == MACH_TYPE_SNAPPERDV)
-#else
-# define machine_is_snapperdv()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AVENGERS_LITE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AVENGERS_LITE
-# endif
-# define machine_is_avengers_lite()	(machine_arch_type == MACH_TYPE_AVENGERS_LITE)
-#else
-# define machine_is_avengers_lite()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AVENGERS_LITE1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AVENGERS_LITE1
-# endif
-# define machine_is_avengers_lite1()	(machine_arch_type == MACH_TYPE_AVENGERS_LITE1)
-#else
-# define machine_is_avengers_lite1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3AXON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP3AXON
-# endif
-# define machine_is_omap3axon()	(machine_arch_type == MACH_TYPE_OMAP3AXON)
-#else
-# define machine_is_omap3axon()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MA8XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MA8XX
-# endif
-# define machine_is_ma8xx()	(machine_arch_type == MACH_TYPE_MA8XX)
-#else
-# define machine_is_ma8xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MP201EK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MP201EK
-# endif
-# define machine_is_mp201ek()	(machine_arch_type == MACH_TYPE_MP201EK)
-#else
-# define machine_is_mp201ek()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_TUX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DAVINCI_TUX
-# endif
-# define machine_is_davinci_tux()	(machine_arch_type == MACH_TYPE_DAVINCI_TUX)
-#else
-# define machine_is_davinci_tux()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MPA1600
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MPA1600
-# endif
-# define machine_is_mpa1600()	(machine_arch_type == MACH_TYPE_MPA1600)
-#else
-# define machine_is_mpa1600()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PELCO_TROY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PELCO_TROY
-# endif
-# define machine_is_pelco_troy()	(machine_arch_type == MACH_TYPE_PELCO_TROY)
-#else
-# define machine_is_pelco_troy()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NSB667
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NSB667
-# endif
-# define machine_is_nsb667()	(machine_arch_type == MACH_TYPE_NSB667)
-#else
-# define machine_is_nsb667()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ROVERS5_4MPIX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ROVERS5_4MPIX
-# endif
-# define machine_is_rovers5_4mpix()	(machine_arch_type == MACH_TYPE_ROVERS5_4MPIX)
-#else
-# define machine_is_rovers5_4mpix()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TWOCOM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TWOCOM
-# endif
-# define machine_is_twocom()	(machine_arch_type == MACH_TYPE_TWOCOM)
-#else
-# define machine_is_twocom()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UBISYS_P9_RCU3R2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UBISYS_P9_RCU3R2
-# endif
-# define machine_is_ubisys_p9_rcu3r2()	(machine_arch_type == MACH_TYPE_UBISYS_P9_RCU3R2)
-#else
-# define machine_is_ubisys_p9_rcu3r2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HERO_ESPRESSO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HERO_ESPRESSO
-# endif
-# define machine_is_hero_espresso()	(machine_arch_type == MACH_TYPE_HERO_ESPRESSO)
-#else
-# define machine_is_hero_espresso()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AFEUSB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AFEUSB
-# endif
-# define machine_is_afeusb()	(machine_arch_type == MACH_TYPE_AFEUSB)
-#else
-# define machine_is_afeusb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_T830
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_T830
-# endif
-# define machine_is_t830()	(machine_arch_type == MACH_TYPE_T830)
-#else
-# define machine_is_t830()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SPD8020_CC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SPD8020_CC
-# endif
-# define machine_is_spd8020_cc()	(machine_arch_type == MACH_TYPE_SPD8020_CC)
-#else
-# define machine_is_spd8020_cc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OM_3D7K
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OM_3D7K
-# endif
-# define machine_is_om_3d7k()	(machine_arch_type == MACH_TYPE_OM_3D7K)
-#else
-# define machine_is_om_3d7k()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PICOCOM2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PICOCOM2
-# endif
-# define machine_is_picocom2()	(machine_arch_type == MACH_TYPE_PICOCOM2)
-#else
-# define machine_is_picocom2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UWG4MX27
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UWG4MX27
-# endif
-# define machine_is_uwg4mx27()	(machine_arch_type == MACH_TYPE_UWG4MX27)
-#else
-# define machine_is_uwg4mx27()	(0)
-#endif
-
-#ifdef CONFIG_MACH_UWG4MX31
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_UWG4MX31
-# endif
-# define machine_is_uwg4mx31()	(machine_arch_type == MACH_TYPE_UWG4MX31)
-#else
-# define machine_is_uwg4mx31()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CHERRY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CHERRY
-# endif
-# define machine_is_cherry()	(machine_arch_type == MACH_TYPE_CHERRY)
-#else
-# define machine_is_cherry()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX51_BABBAGE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX51_BABBAGE
-# endif
-# define machine_is_mx51_babbage()	(machine_arch_type == MACH_TYPE_MX51_BABBAGE)
-#else
-# define machine_is_mx51_babbage()	(0)
-#endif
-
-#ifdef CONFIG_MACH_S3C2440TURKIYE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S3C2440TURKIYE
-# endif
-# define machine_is_s3c2440turkiye()	(machine_arch_type == MACH_TYPE_S3C2440TURKIYE)
-#else
-# define machine_is_s3c2440turkiye()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TX37
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TX37
-# endif
-# define machine_is_tx37()	(machine_arch_type == MACH_TYPE_TX37)
-#else
-# define machine_is_tx37()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SBC2800_9G20
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SBC2800_9G20
-# endif
-# define machine_is_sbc2800_9g20()	(machine_arch_type == MACH_TYPE_SBC2800_9G20)
-#else
-# define machine_is_sbc2800_9g20()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BENZGLB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BENZGLB
-# endif
-# define machine_is_benzglb()	(machine_arch_type == MACH_TYPE_BENZGLB)
-#else
-# define machine_is_benzglb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BENZTD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BENZTD
-# endif
-# define machine_is_benztd()	(machine_arch_type == MACH_TYPE_BENZTD)
-#else
-# define machine_is_benztd()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CARTESIO_PLUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CARTESIO_PLUS
-# endif
-# define machine_is_cartesio_plus()	(machine_arch_type == MACH_TYPE_CARTESIO_PLUS)
-#else
-# define machine_is_cartesio_plus()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SOLRAD_G20
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SOLRAD_G20
-# endif
-# define machine_is_solrad_g20()	(machine_arch_type == MACH_TYPE_SOLRAD_G20)
-#else
-# define machine_is_solrad_g20()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX27WALLACE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX27WALLACE
-# endif
-# define machine_is_mx27wallace()	(machine_arch_type == MACH_TYPE_MX27WALLACE)
-#else
-# define machine_is_mx27wallace()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FMZWEBMODUL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FMZWEBMODUL
-# endif
-# define machine_is_fmzwebmodul()	(machine_arch_type == MACH_TYPE_FMZWEBMODUL)
-#else
-# define machine_is_fmzwebmodul()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RD78X00_MASA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RD78X00_MASA
-# endif
-# define machine_is_rd78x00_masa()	(machine_arch_type == MACH_TYPE_RD78X00_MASA)
-#else
-# define machine_is_rd78x00_masa()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SMALLOGGER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMALLOGGER
-# endif
-# define machine_is_smallogger()	(machine_arch_type == MACH_TYPE_SMALLOGGER)
-#else
-# define machine_is_smallogger()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CCW9P9215
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CCW9P9215
-# endif
-# define machine_is_ccw9p9215()	(machine_arch_type == MACH_TYPE_CCW9P9215)
-#else
-# define machine_is_ccw9p9215()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DM355_LEOPARD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DM355_LEOPARD
-# endif
-# define machine_is_dm355_leopard()	(machine_arch_type == MACH_TYPE_DM355_LEOPARD)
-#else
-# define machine_is_dm355_leopard()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TS219
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TS219
-# endif
-# define machine_is_ts219()	(machine_arch_type == MACH_TYPE_TS219)
-#else
-# define machine_is_ts219()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TNY_A9263
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TNY_A9263
-# endif
-# define machine_is_tny_a9263()	(machine_arch_type == MACH_TYPE_TNY_A9263)
-#else
-# define machine_is_tny_a9263()	(0)
-#endif
-
-#ifdef CONFIG_MACH_APOLLO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_APOLLO
-# endif
-# define machine_is_apollo()	(machine_arch_type == MACH_TYPE_APOLLO)
-#else
-# define machine_is_apollo()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91CAP9STK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91CAP9STK
-# endif
-# define machine_is_at91cap9stk()	(machine_arch_type == MACH_TYPE_AT91CAP9STK)
-#else
-# define machine_is_at91cap9stk()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SPC300
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SPC300
-# endif
-# define machine_is_spc300()	(machine_arch_type == MACH_TYPE_SPC300)
-#else
-# define machine_is_spc300()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EKO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EKO
-# endif
-# define machine_is_eko()	(machine_arch_type == MACH_TYPE_EKO)
-#else
-# define machine_is_eko()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CCW9M2443
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CCW9M2443
-# endif
-# define machine_is_ccw9m2443()	(machine_arch_type == MACH_TYPE_CCW9M2443)
-#else
-# define machine_is_ccw9m2443()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CCW9M2443JS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CCW9M2443JS
-# endif
-# define machine_is_ccw9m2443js()	(machine_arch_type == MACH_TYPE_CCW9M2443JS)
-#else
-# define machine_is_ccw9m2443js()	(0)
-#endif
-
-#ifdef CONFIG_MACH_M2M_ROUTER_DEVICE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_M2M_ROUTER_DEVICE
-# endif
-# define machine_is_m2m_router_device()	(machine_arch_type == MACH_TYPE_M2M_ROUTER_DEVICE)
-#else
-# define machine_is_m2m_router_device()	(0)
-#endif
-
-#ifdef CONFIG_MACH_STAR9104NAS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STAR9104NAS
-# endif
-# define machine_is_str9104nas()	(machine_arch_type == MACH_TYPE_STAR9104NAS)
-#else
-# define machine_is_str9104nas()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PCA100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PCA100
-# endif
-# define machine_is_pca100()	(machine_arch_type == MACH_TYPE_PCA100)
-#else
-# define machine_is_pca100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_Z3_DM365_MOD_01
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_Z3_DM365_MOD_01
-# endif
-# define machine_is_z3_dm365_mod_01()	(machine_arch_type == MACH_TYPE_Z3_DM365_MOD_01)
-#else
-# define machine_is_z3_dm365_mod_01()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HIPOX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HIPOX
-# endif
-# define machine_is_hipox()	(machine_arch_type == MACH_TYPE_HIPOX)
-#else
-# define machine_is_hipox()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_PITEDS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP3_PITEDS
-# endif
-# define machine_is_omap3_piteds()	(machine_arch_type == MACH_TYPE_OMAP3_PITEDS)
-#else
-# define machine_is_omap3_piteds()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BM150R
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BM150R
-# endif
-# define machine_is_bm150r()	(machine_arch_type == MACH_TYPE_BM150R)
-#else
-# define machine_is_bm150r()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TBONE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TBONE
-# endif
-# define machine_is_tbone()	(machine_arch_type == MACH_TYPE_TBONE)
-#else
-# define machine_is_tbone()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MERLIN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MERLIN
-# endif
-# define machine_is_merlin()	(machine_arch_type == MACH_TYPE_MERLIN)
-#else
-# define machine_is_merlin()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FALCON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FALCON
-# endif
-# define machine_is_falcon()	(machine_arch_type == MACH_TYPE_FALCON)
-#else
-# define machine_is_falcon()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_DA850_EVM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DAVINCI_DA850_EVM
-# endif
-# define machine_is_davinci_da850_evm()	(machine_arch_type == MACH_TYPE_DAVINCI_DA850_EVM)
-#else
-# define machine_is_davinci_da850_evm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_S5P6440
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_S5P6440
-# endif
-# define machine_is_s5p6440()	(machine_arch_type == MACH_TYPE_S5P6440)
-#else
-# define machine_is_s5p6440()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM9G10EK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91SAM9G10EK
-# endif
-# define machine_is_at91sam9g10ek()	(machine_arch_type == MACH_TYPE_AT91SAM9G10EK)
-#else
-# define machine_is_at91sam9g10ek()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_4430SDP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_4430SDP
-# endif
-# define machine_is_omap_4430sdp()	(machine_arch_type == MACH_TYPE_OMAP_4430SDP)
-#else
-# define machine_is_omap_4430sdp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LPC313X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LPC313X
-# endif
-# define machine_is_lpc313x()	(machine_arch_type == MACH_TYPE_LPC313X)
-#else
-# define machine_is_lpc313x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MAGX_ZN5
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MAGX_ZN5
-# endif
-# define machine_is_magx_zn5()	(machine_arch_type == MACH_TYPE_MAGX_ZN5)
-#else
-# define machine_is_magx_zn5()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MAGX_EM30
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MAGX_EM30
-# endif
-# define machine_is_magx_em30()	(machine_arch_type == MACH_TYPE_MAGX_EM30)
-#else
-# define machine_is_magx_em30()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MAGX_VE66
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MAGX_VE66
-# endif
-# define machine_is_magx_ve66()	(machine_arch_type == MACH_TYPE_MAGX_VE66)
-#else
-# define machine_is_magx_ve66()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MEESC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MEESC
-# endif
-# define machine_is_meesc()	(machine_arch_type == MACH_TYPE_MEESC)
-#else
-# define machine_is_meesc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OTC570
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OTC570
-# endif
-# define machine_is_otc570()	(machine_arch_type == MACH_TYPE_OTC570)
-#else
-# define machine_is_otc570()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BCU2412
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BCU2412
-# endif
-# define machine_is_bcu2412()	(machine_arch_type == MACH_TYPE_BCU2412)
-#else
-# define machine_is_bcu2412()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BEACON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BEACON
-# endif
-# define machine_is_beacon()	(machine_arch_type == MACH_TYPE_BEACON)
-#else
-# define machine_is_beacon()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ACTIA_TGW
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ACTIA_TGW
-# endif
-# define machine_is_actia_tgw()	(machine_arch_type == MACH_TYPE_ACTIA_TGW)
-#else
-# define machine_is_actia_tgw()	(0)
-#endif
-
-#ifdef CONFIG_MACH_E4430
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_E4430
-# endif
-# define machine_is_e4430()	(machine_arch_type == MACH_TYPE_E4430)
-#else
-# define machine_is_e4430()	(0)
-#endif
-
-#ifdef CONFIG_MACH_QL300
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_QL300
-# endif
-# define machine_is_ql300()	(machine_arch_type == MACH_TYPE_QL300)
-#else
-# define machine_is_ql300()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BTMAVB101
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BTMAVB101
-# endif
-# define machine_is_btmavb101()	(machine_arch_type == MACH_TYPE_BTMAVB101)
-#else
-# define machine_is_btmavb101()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BTMAWB101
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BTMAWB101
-# endif
-# define machine_is_btmawb101()	(machine_arch_type == MACH_TYPE_BTMAWB101)
-#else
-# define machine_is_btmawb101()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SQ201
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SQ201
-# endif
-# define machine_is_sq201()	(machine_arch_type == MACH_TYPE_SQ201)
-#else
-# define machine_is_sq201()	(0)
-#endif
-
-#ifdef CONFIG_MACH_QUATRO45XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_QUATRO45XX
-# endif
-# define machine_is_quatro45xx()	(machine_arch_type == MACH_TYPE_QUATRO45XX)
-#else
-# define machine_is_quatro45xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OPENPAD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OPENPAD
-# endif
-# define machine_is_openpad()	(machine_arch_type == MACH_TYPE_OPENPAD)
-#else
-# define machine_is_openpad()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TX25
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TX25
-# endif
-# define machine_is_tx25()	(machine_arch_type == MACH_TYPE_TX25)
-#else
-# define machine_is_tx25()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_TORPEDO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP3_TORPEDO
-# endif
-# define machine_is_omap3_torpedo()	(machine_arch_type == MACH_TYPE_OMAP3_TORPEDO)
-#else
-# define machine_is_omap3_torpedo()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCRAPHAEL_K
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCRAPHAEL_K
-# endif
-# define machine_is_htcraphael_k()	(machine_arch_type == MACH_TYPE_HTCRAPHAEL_K)
-#else
-# define machine_is_htcraphael_k()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LAL43
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LAL43
-# endif
-# define machine_is_lal43()	(machine_arch_type == MACH_TYPE_LAL43)
-#else
-# define machine_is_lal43()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCRAPHAEL_CDMA500
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCRAPHAEL_CDMA500
-# endif
-# define machine_is_htcraphael_cdma500()	(machine_arch_type == MACH_TYPE_HTCRAPHAEL_CDMA500)
-#else
-# define machine_is_htcraphael_cdma500()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ANW6410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ANW6410
-# endif
-# define machine_is_anw6410()	(machine_arch_type == MACH_TYPE_ANW6410)
-#else
-# define machine_is_anw6410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCPROPHET
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCPROPHET
-# endif
-# define machine_is_htcprophet()	(machine_arch_type == MACH_TYPE_HTCPROPHET)
-#else
-# define machine_is_htcprophet()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CFA_10022
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CFA_10022
-# endif
-# define machine_is_cfa_10022()	(machine_arch_type == MACH_TYPE_CFA_10022)
-#else
-# define machine_is_cfa_10022()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IMX27_VISSTRIM_M10
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IMX27_VISSTRIM_M10
-# endif
-# define machine_is_imx27_visstrim_m10()	(machine_arch_type == MACH_TYPE_IMX27_VISSTRIM_M10)
-#else
-# define machine_is_imx27_visstrim_m10()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PX2IMX27
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PX2IMX27
-# endif
-# define machine_is_px2imx27()	(machine_arch_type == MACH_TYPE_PX2IMX27)
-#else
-# define machine_is_px2imx27()	(0)
-#endif
-
-#ifdef CONFIG_MACH_STM3210E_EVAL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STM3210E_EVAL
-# endif
-# define machine_is_stm3210e_eval()	(machine_arch_type == MACH_TYPE_STM3210E_EVAL)
-#else
-# define machine_is_stm3210e_eval()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DVS10
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DVS10
-# endif
-# define machine_is_dvs10()	(machine_arch_type == MACH_TYPE_DVS10)
-#else
-# define machine_is_dvs10()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PORTUXG20
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PORTUXG20
-# endif
-# define machine_is_portuxg20()	(machine_arch_type == MACH_TYPE_PORTUXG20)
-#else
-# define machine_is_portuxg20()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARM_SPV
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARM_SPV
-# endif
-# define machine_is_arm_spv()	(machine_arch_type == MACH_TYPE_ARM_SPV)
-#else
-# define machine_is_arm_spv()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SMDKC110
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMDKC110
-# endif
-# define machine_is_smdkc110()	(machine_arch_type == MACH_TYPE_SMDKC110)
-#else
-# define machine_is_smdkc110()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CABESPRESSO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CABESPRESSO
-# endif
-# define machine_is_cabespresso()	(machine_arch_type == MACH_TYPE_CABESPRESSO)
-#else
-# define machine_is_cabespresso()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HMC800
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HMC800
-# endif
-# define machine_is_hmc800()	(machine_arch_type == MACH_TYPE_HMC800)
-#else
-# define machine_is_hmc800()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SHOLES
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SHOLES
-# endif
-# define machine_is_sholes()	(machine_arch_type == MACH_TYPE_SHOLES)
-#else
-# define machine_is_sholes()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BTMXC31
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BTMXC31
-# endif
-# define machine_is_btmxc31()	(machine_arch_type == MACH_TYPE_BTMXC31)
-#else
-# define machine_is_btmxc31()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DT501
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DT501
-# endif
-# define machine_is_dt501()	(machine_arch_type == MACH_TYPE_DT501)
-#else
-# define machine_is_dt501()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KTX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KTX
-# endif
-# define machine_is_ktx()	(machine_arch_type == MACH_TYPE_KTX)
-#else
-# define machine_is_ktx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3517EVM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP3517EVM
-# endif
-# define machine_is_omap3517evm()	(machine_arch_type == MACH_TYPE_OMAP3517EVM)
-#else
-# define machine_is_omap3517evm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NETSPACE_V2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NETSPACE_V2
-# endif
-# define machine_is_netspace_v2()	(machine_arch_type == MACH_TYPE_NETSPACE_V2)
-#else
-# define machine_is_netspace_v2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NETSPACE_MAX_V2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NETSPACE_MAX_V2
-# endif
-# define machine_is_netspace_max_v2()	(machine_arch_type == MACH_TYPE_NETSPACE_MAX_V2)
-#else
-# define machine_is_netspace_max_v2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_D2NET_V2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_D2NET_V2
-# endif
-# define machine_is_d2net_v2()	(machine_arch_type == MACH_TYPE_D2NET_V2)
-#else
-# define machine_is_d2net_v2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NET2BIG_V2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NET2BIG_V2
-# endif
-# define machine_is_net2big_v2()	(machine_arch_type == MACH_TYPE_NET2BIG_V2)
-#else
-# define machine_is_net2big_v2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NET4BIG_V2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NET4BIG_V2
-# endif
-# define machine_is_net4big_v2()	(machine_arch_type == MACH_TYPE_NET4BIG_V2)
-#else
-# define machine_is_net4big_v2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NET5BIG_V2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NET5BIG_V2
-# endif
-# define machine_is_net5big_v2()	(machine_arch_type == MACH_TYPE_NET5BIG_V2)
-#else
-# define machine_is_net5big_v2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ENDB2443
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ENDB2443
-# endif
-# define machine_is_endb2443()	(machine_arch_type == MACH_TYPE_ENDB2443)
-#else
-# define machine_is_endb2443()	(0)
-#endif
-
-#ifdef CONFIG_MACH_INETSPACE_V2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_INETSPACE_V2
-# endif
-# define machine_is_inetspace_v2()	(machine_arch_type == MACH_TYPE_INETSPACE_V2)
-#else
-# define machine_is_inetspace_v2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TROS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TROS
-# endif
-# define machine_is_tros()	(machine_arch_type == MACH_TYPE_TROS)
-#else
-# define machine_is_tros()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PELCO_HOMER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PELCO_HOMER
-# endif
-# define machine_is_pelco_homer()	(machine_arch_type == MACH_TYPE_PELCO_HOMER)
-#else
-# define machine_is_pelco_homer()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OFSP8
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OFSP8
-# endif
-# define machine_is_ofsp8()	(machine_arch_type == MACH_TYPE_OFSP8)
-#else
-# define machine_is_ofsp8()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM9G45EKES
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91SAM9G45EKES
-# endif
-# define machine_is_at91sam9g45ekes()	(machine_arch_type == MACH_TYPE_AT91SAM9G45EKES)
-#else
-# define machine_is_at91sam9g45ekes()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GUF_CUPID
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GUF_CUPID
-# endif
-# define machine_is_guf_cupid()	(machine_arch_type == MACH_TYPE_GUF_CUPID)
-#else
-# define machine_is_guf_cupid()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EAB1R
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EAB1R
-# endif
-# define machine_is_eab1r()	(machine_arch_type == MACH_TYPE_EAB1R)
-#else
-# define machine_is_eab1r()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DESIREC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DESIREC
-# endif
-# define machine_is_desirec()	(machine_arch_type == MACH_TYPE_DESIREC)
-#else
-# define machine_is_desirec()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CORDOBA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CORDOBA
-# endif
-# define machine_is_cordoba()	(machine_arch_type == MACH_TYPE_CORDOBA)
-#else
-# define machine_is_cordoba()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IRVINE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IRVINE
-# endif
-# define machine_is_irvine()	(machine_arch_type == MACH_TYPE_IRVINE)
-#else
-# define machine_is_irvine()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SFF772
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SFF772
-# endif
-# define machine_is_sff772()	(machine_arch_type == MACH_TYPE_SFF772)
-#else
-# define machine_is_sff772()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PELCO_MILANO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PELCO_MILANO
-# endif
-# define machine_is_pelco_milano()	(machine_arch_type == MACH_TYPE_PELCO_MILANO)
-#else
-# define machine_is_pelco_milano()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PC7302
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PC7302
-# endif
-# define machine_is_pc7302()	(machine_arch_type == MACH_TYPE_PC7302)
-#else
-# define machine_is_pc7302()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BIP6000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BIP6000
-# endif
-# define machine_is_bip6000()	(machine_arch_type == MACH_TYPE_BIP6000)
-#else
-# define machine_is_bip6000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SILVERMOON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SILVERMOON
-# endif
-# define machine_is_silvermoon()	(machine_arch_type == MACH_TYPE_SILVERMOON)
-#else
-# define machine_is_silvermoon()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VC0830
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VC0830
-# endif
-# define machine_is_vc0830()	(machine_arch_type == MACH_TYPE_VC0830)
-#else
-# define machine_is_vc0830()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DT430
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DT430
-# endif
-# define machine_is_dt430()	(machine_arch_type == MACH_TYPE_DT430)
-#else
-# define machine_is_dt430()	(0)
-#endif
-
-#ifdef CONFIG_MACH_JI42PF
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_JI42PF
-# endif
-# define machine_is_ji42pf()	(machine_arch_type == MACH_TYPE_JI42PF)
-#else
-# define machine_is_ji42pf()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GNET_KSM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GNET_KSM
-# endif
-# define machine_is_gnet_ksm()	(machine_arch_type == MACH_TYPE_GNET_KSM)
-#else
-# define machine_is_gnet_ksm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GNET_SGM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GNET_SGM
-# endif
-# define machine_is_gnet_sgm()	(machine_arch_type == MACH_TYPE_GNET_SGM)
-#else
-# define machine_is_gnet_sgm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GNET_SGR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GNET_SGR
-# endif
-# define machine_is_gnet_sgr()	(machine_arch_type == MACH_TYPE_GNET_SGR)
-#else
-# define machine_is_gnet_sgr()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_ICETEKEVM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP3_ICETEKEVM
-# endif
-# define machine_is_omap3_icetekevm()	(machine_arch_type == MACH_TYPE_OMAP3_ICETEKEVM)
-#else
-# define machine_is_omap3_icetekevm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PNP
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PNP
-# endif
-# define machine_is_pnp()	(machine_arch_type == MACH_TYPE_PNP)
-#else
-# define machine_is_pnp()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CTERA_2BAY_K
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CTERA_2BAY_K
-# endif
-# define machine_is_ctera_2bay_k()	(machine_arch_type == MACH_TYPE_CTERA_2BAY_K)
-#else
-# define machine_is_ctera_2bay_k()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CTERA_2BAY_U
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CTERA_2BAY_U
-# endif
-# define machine_is_ctera_2bay_u()	(machine_arch_type == MACH_TYPE_CTERA_2BAY_U)
-#else
-# define machine_is_ctera_2bay_u()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SAS_C
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SAS_C
-# endif
-# define machine_is_sas_c()	(machine_arch_type == MACH_TYPE_SAS_C)
-#else
-# define machine_is_sas_c()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VMA2315
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VMA2315
-# endif
-# define machine_is_vma2315()	(machine_arch_type == MACH_TYPE_VMA2315)
-#else
-# define machine_is_vma2315()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VCS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VCS
-# endif
-# define machine_is_vcs()	(machine_arch_type == MACH_TYPE_VCS)
-#else
-# define machine_is_vcs()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SPEAR600
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SPEAR600
-# endif
-# define machine_is_spear600()	(machine_arch_type == MACH_TYPE_SPEAR600)
-#else
-# define machine_is_spear600()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SPEAR300
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SPEAR300
-# endif
-# define machine_is_spear300()	(machine_arch_type == MACH_TYPE_SPEAR300)
-#else
-# define machine_is_spear300()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SPEAR1300
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SPEAR1300
-# endif
-# define machine_is_spear1300()	(machine_arch_type == MACH_TYPE_SPEAR1300)
-#else
-# define machine_is_spear1300()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LILLY1131
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LILLY1131
-# endif
-# define machine_is_lilly1131()	(machine_arch_type == MACH_TYPE_LILLY1131)
-#else
-# define machine_is_lilly1131()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARVOO_AX301
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARVOO_AX301
-# endif
-# define machine_is_arvoo_ax301()	(machine_arch_type == MACH_TYPE_ARVOO_AX301)
-#else
-# define machine_is_arvoo_ax301()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MAPPHONE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MAPPHONE
-# endif
-# define machine_is_mapphone()	(machine_arch_type == MACH_TYPE_MAPPHONE)
-#else
-# define machine_is_mapphone()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LEGEND
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LEGEND
-# endif
-# define machine_is_legend()	(machine_arch_type == MACH_TYPE_LEGEND)
-#else
-# define machine_is_legend()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SALSA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SALSA
-# endif
-# define machine_is_salsa()	(machine_arch_type == MACH_TYPE_SALSA)
-#else
-# define machine_is_salsa()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LOUNGE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LOUNGE
-# endif
-# define machine_is_lounge()	(machine_arch_type == MACH_TYPE_LOUNGE)
-#else
-# define machine_is_lounge()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VISION
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VISION
-# endif
-# define machine_is_vision()	(machine_arch_type == MACH_TYPE_VISION)
-#else
-# define machine_is_vision()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VMB20
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VMB20
-# endif
-# define machine_is_vmb20()	(machine_arch_type == MACH_TYPE_VMB20)
-#else
-# define machine_is_vmb20()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HY2410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HY2410
-# endif
-# define machine_is_hy2410()	(machine_arch_type == MACH_TYPE_HY2410)
-#else
-# define machine_is_hy2410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HY9315
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HY9315
-# endif
-# define machine_is_hy9315()	(machine_arch_type == MACH_TYPE_HY9315)
-#else
-# define machine_is_hy9315()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BULLWINKLE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BULLWINKLE
-# endif
-# define machine_is_bullwinkle()	(machine_arch_type == MACH_TYPE_BULLWINKLE)
-#else
-# define machine_is_bullwinkle()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARM_ULTIMATOR2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARM_ULTIMATOR2
-# endif
-# define machine_is_arm_ultimator2()	(machine_arch_type == MACH_TYPE_ARM_ULTIMATOR2)
-#else
-# define machine_is_arm_ultimator2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VS_V210
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VS_V210
-# endif
-# define machine_is_vs_v210()	(machine_arch_type == MACH_TYPE_VS_V210)
-#else
-# define machine_is_vs_v210()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VS_V212
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VS_V212
-# endif
-# define machine_is_vs_v212()	(machine_arch_type == MACH_TYPE_VS_V212)
-#else
-# define machine_is_vs_v212()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HMT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HMT
-# endif
-# define machine_is_hmt()	(machine_arch_type == MACH_TYPE_HMT)
-#else
-# define machine_is_hmt()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SUEN3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SUEN3
-# endif
-# define machine_is_suen3()	(machine_arch_type == MACH_TYPE_SUEN3)
-#else
-# define machine_is_suen3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VESPER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VESPER
-# endif
-# define machine_is_vesper()	(machine_arch_type == MACH_TYPE_VESPER)
-#else
-# define machine_is_vesper()	(0)
-#endif
-
-#ifdef CONFIG_MACH_STR9
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STR9
-# endif
-# define machine_is_str9()	(machine_arch_type == MACH_TYPE_STR9)
-#else
-# define machine_is_str9()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_WL_FF
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP3_WL_FF
-# endif
-# define machine_is_omap3_wl_ff()	(machine_arch_type == MACH_TYPE_OMAP3_WL_FF)
-#else
-# define machine_is_omap3_wl_ff()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SIMCOM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SIMCOM
-# endif
-# define machine_is_simcom()	(machine_arch_type == MACH_TYPE_SIMCOM)
-#else
-# define machine_is_simcom()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MCWEBIO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MCWEBIO
-# endif
-# define machine_is_mcwebio()	(machine_arch_type == MACH_TYPE_MCWEBIO)
-#else
-# define machine_is_mcwebio()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_PHRAZER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP3_PHRAZER
-# endif
-# define machine_is_omap3_phrazer()	(machine_arch_type == MACH_TYPE_OMAP3_PHRAZER)
-#else
-# define machine_is_omap3_phrazer()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DARWIN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DARWIN
-# endif
-# define machine_is_darwin()	(machine_arch_type == MACH_TYPE_DARWIN)
-#else
-# define machine_is_darwin()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ORATISCOMU
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ORATISCOMU
-# endif
-# define machine_is_oratiscomu()	(machine_arch_type == MACH_TYPE_ORATISCOMU)
-#else
-# define machine_is_oratiscomu()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RTSBC20
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RTSBC20
-# endif
-# define machine_is_rtsbc20()	(machine_arch_type == MACH_TYPE_RTSBC20)
-#else
-# define machine_is_rtsbc20()	(0)
-#endif
-
-#ifdef CONFIG_MACH_I780
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_I780
-# endif
-# define machine_is_sgh_i780()	(machine_arch_type == MACH_TYPE_I780)
-#else
-# define machine_is_sgh_i780()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GEMINI324
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GEMINI324
-# endif
-# define machine_is_gemini324()	(machine_arch_type == MACH_TYPE_GEMINI324)
-#else
-# define machine_is_gemini324()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ORATISLAN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ORATISLAN
-# endif
-# define machine_is_oratislan()	(machine_arch_type == MACH_TYPE_ORATISLAN)
-#else
-# define machine_is_oratislan()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ORATISALOG
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ORATISALOG
-# endif
-# define machine_is_oratisalog()	(machine_arch_type == MACH_TYPE_ORATISALOG)
-#else
-# define machine_is_oratisalog()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ORATISMADI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ORATISMADI
-# endif
-# define machine_is_oratismadi()	(machine_arch_type == MACH_TYPE_ORATISMADI)
-#else
-# define machine_is_oratismadi()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ORATISOT16
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ORATISOT16
-# endif
-# define machine_is_oratisot16()	(machine_arch_type == MACH_TYPE_ORATISOT16)
-#else
-# define machine_is_oratisot16()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ORATISDESK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ORATISDESK
-# endif
-# define machine_is_oratisdesk()	(machine_arch_type == MACH_TYPE_ORATISDESK)
-#else
-# define machine_is_oratisdesk()	(0)
-#endif
-
-#ifdef CONFIG_MACH_V2P_CA9
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_V2P_CA9
-# endif
-# define machine_is_v2_ca9()	(machine_arch_type == MACH_TYPE_V2P_CA9)
-#else
-# define machine_is_v2_ca9()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SINTEXO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SINTEXO
-# endif
-# define machine_is_sintexo()	(machine_arch_type == MACH_TYPE_SINTEXO)
-#else
-# define machine_is_sintexo()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CM3389
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CM3389
-# endif
-# define machine_is_cm3389()	(machine_arch_type == MACH_TYPE_CM3389)
-#else
-# define machine_is_cm3389()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_CIO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP3_CIO
-# endif
-# define machine_is_omap3_cio()	(machine_arch_type == MACH_TYPE_OMAP3_CIO)
-#else
-# define machine_is_omap3_cio()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SGH_I900
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SGH_I900
-# endif
-# define machine_is_sgh_i900()	(machine_arch_type == MACH_TYPE_SGH_I900)
-#else
-# define machine_is_sgh_i900()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BST100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BST100
-# endif
-# define machine_is_bst100()	(machine_arch_type == MACH_TYPE_BST100)
-#else
-# define machine_is_bst100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PASSION
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PASSION
-# endif
-# define machine_is_passion()	(machine_arch_type == MACH_TYPE_PASSION)
-#else
-# define machine_is_passion()	(0)
-#endif
-
-#ifdef CONFIG_MACH_INDESIGN_AT91SAM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_INDESIGN_AT91SAM
-# endif
-# define machine_is_indesign_at91sam()	(machine_arch_type == MACH_TYPE_INDESIGN_AT91SAM)
-#else
-# define machine_is_indesign_at91sam()	(0)
-#endif
-
-#ifdef CONFIG_MACH_C4_BADGER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_C4_BADGER
-# endif
-# define machine_is_c4_badger()	(machine_arch_type == MACH_TYPE_C4_BADGER)
-#else
-# define machine_is_c4_badger()	(0)
-#endif
-
-#ifdef CONFIG_MACH_C4_VIPER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_C4_VIPER
-# endif
-# define machine_is_c4_viper()	(machine_arch_type == MACH_TYPE_C4_VIPER)
-#else
-# define machine_is_c4_viper()	(0)
-#endif
-
-#ifdef CONFIG_MACH_D2NET
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_D2NET
-# endif
-# define machine_is_d2net()	(machine_arch_type == MACH_TYPE_D2NET)
-#else
-# define machine_is_d2net()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BIGDISK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BIGDISK
-# endif
-# define machine_is_bigdisk()	(machine_arch_type == MACH_TYPE_BIGDISK)
-#else
-# define machine_is_bigdisk()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NOTALVISION
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NOTALVISION
-# endif
-# define machine_is_notalvision()	(machine_arch_type == MACH_TYPE_NOTALVISION)
-#else
-# define machine_is_notalvision()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_KBOC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP3_KBOC
-# endif
-# define machine_is_omap3_kboc()	(machine_arch_type == MACH_TYPE_OMAP3_KBOC)
-#else
-# define machine_is_omap3_kboc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CYCLONE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CYCLONE
-# endif
-# define machine_is_cyclone()	(machine_arch_type == MACH_TYPE_CYCLONE)
-#else
-# define machine_is_cyclone()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NINJA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NINJA
-# endif
-# define machine_is_ninja()	(machine_arch_type == MACH_TYPE_NINJA)
-#else
-# define machine_is_ninja()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM9G20EK_2MMC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91SAM9G20EK_2MMC
-# endif
-# define machine_is_at91sam9g20ek_2mmc()	(machine_arch_type == MACH_TYPE_AT91SAM9G20EK_2MMC)
-#else
-# define machine_is_at91sam9g20ek_2mmc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BCMRING
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BCMRING
-# endif
-# define machine_is_bcmring()	(machine_arch_type == MACH_TYPE_BCMRING)
-#else
-# define machine_is_bcmring()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RESOL_DL2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RESOL_DL2
-# endif
-# define machine_is_resol_dl2()	(machine_arch_type == MACH_TYPE_RESOL_DL2)
-#else
-# define machine_is_resol_dl2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IFOSW
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IFOSW
-# endif
-# define machine_is_ifosw()	(machine_arch_type == MACH_TYPE_IFOSW)
-#else
-# define machine_is_ifosw()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCRHODIUM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCRHODIUM
-# endif
-# define machine_is_htcrhodium()	(machine_arch_type == MACH_TYPE_HTCRHODIUM)
-#else
-# define machine_is_htcrhodium()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCTOPAZ
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCTOPAZ
-# endif
-# define machine_is_htctopaz()	(machine_arch_type == MACH_TYPE_HTCTOPAZ)
-#else
-# define machine_is_htctopaz()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MATRIX504
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MATRIX504
-# endif
-# define machine_is_matrix504()	(machine_arch_type == MACH_TYPE_MATRIX504)
-#else
-# define machine_is_matrix504()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MRFSA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MRFSA
-# endif
-# define machine_is_mrfsa()	(machine_arch_type == MACH_TYPE_MRFSA)
-#else
-# define machine_is_mrfsa()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SC_P270
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SC_P270
-# endif
-# define machine_is_sc_p270()	(machine_arch_type == MACH_TYPE_SC_P270)
-#else
-# define machine_is_sc_p270()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ATLAS5_EVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ATLAS5_EVB
-# endif
-# define machine_is_atlas5_evb()	(machine_arch_type == MACH_TYPE_ATLAS5_EVB)
-#else
-# define machine_is_atlas5_evb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PELCO_LOBOX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PELCO_LOBOX
-# endif
-# define machine_is_pelco_lobox()	(machine_arch_type == MACH_TYPE_PELCO_LOBOX)
-#else
-# define machine_is_pelco_lobox()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DILAX_PCU200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DILAX_PCU200
-# endif
-# define machine_is_dilax_pcu200()	(machine_arch_type == MACH_TYPE_DILAX_PCU200)
-#else
-# define machine_is_dilax_pcu200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LEONARDO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LEONARDO
-# endif
-# define machine_is_leonardo()	(machine_arch_type == MACH_TYPE_LEONARDO)
-#else
-# define machine_is_leonardo()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZORAN_APPROACH7
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZORAN_APPROACH7
-# endif
-# define machine_is_zoran_approach7()	(machine_arch_type == MACH_TYPE_ZORAN_APPROACH7)
-#else
-# define machine_is_zoran_approach7()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DP6XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DP6XX
-# endif
-# define machine_is_dp6xx()	(machine_arch_type == MACH_TYPE_DP6XX)
-#else
-# define machine_is_dp6xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_BCM2153_VESPER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_BCM2153_VESPER
-# endif
-# define machine_is_bcm2153_vesper()	(machine_arch_type == MACH_TYPE_BCM2153_VESPER)
-#else
-# define machine_is_bcm2153_vesper()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MAHIMAHI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MAHIMAHI
-# endif
-# define machine_is_mahimahi()	(machine_arch_type == MACH_TYPE_MAHIMAHI)
-#else
-# define machine_is_mahimahi()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CLICKC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CLICKC
-# endif
-# define machine_is_clickc()	(machine_arch_type == MACH_TYPE_CLICKC)
-#else
-# define machine_is_clickc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ZB_GATEWAY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ZB_GATEWAY
-# endif
-# define machine_is_zb_gateway()	(machine_arch_type == MACH_TYPE_ZB_GATEWAY)
-#else
-# define machine_is_zb_gateway()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TAZCARD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TAZCARD
-# endif
-# define machine_is_tazcard()	(machine_arch_type == MACH_TYPE_TAZCARD)
-#else
-# define machine_is_tazcard()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TAZDEV
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TAZDEV
-# endif
-# define machine_is_tazdev()	(machine_arch_type == MACH_TYPE_TAZDEV)
-#else
-# define machine_is_tazdev()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ANNAX_CB_ARM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ANNAX_CB_ARM
-# endif
-# define machine_is_annax_cb_arm()	(machine_arch_type == MACH_TYPE_ANNAX_CB_ARM)
-#else
-# define machine_is_annax_cb_arm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ANNAX_DM3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ANNAX_DM3
-# endif
-# define machine_is_annax_dm3()	(machine_arch_type == MACH_TYPE_ANNAX_DM3)
-#else
-# define machine_is_annax_dm3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CEREBRIC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CEREBRIC
-# endif
-# define machine_is_cerebric()	(machine_arch_type == MACH_TYPE_CEREBRIC)
-#else
-# define machine_is_cerebric()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ORCA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ORCA
-# endif
-# define machine_is_orca()	(machine_arch_type == MACH_TYPE_ORCA)
-#else
-# define machine_is_orca()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PC9260
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PC9260
-# endif
-# define machine_is_pc9260()	(machine_arch_type == MACH_TYPE_PC9260)
-#else
-# define machine_is_pc9260()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EMS285A
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EMS285A
-# endif
-# define machine_is_ems285a()	(machine_arch_type == MACH_TYPE_EMS285A)
-#else
-# define machine_is_ems285a()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GEC2410
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GEC2410
-# endif
-# define machine_is_gec2410()	(machine_arch_type == MACH_TYPE_GEC2410)
-#else
-# define machine_is_gec2410()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GEC2440
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GEC2440
-# endif
-# define machine_is_gec2440()	(machine_arch_type == MACH_TYPE_GEC2440)
-#else
-# define machine_is_gec2440()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARCH_MW903
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARCH_MW903
-# endif
-# define machine_is_mw903()	(machine_arch_type == MACH_TYPE_ARCH_MW903)
-#else
-# define machine_is_mw903()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MW2440
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MW2440
-# endif
-# define machine_is_mw2440()	(machine_arch_type == MACH_TYPE_MW2440)
-#else
-# define machine_is_mw2440()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ECAC2378
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ECAC2378
-# endif
-# define machine_is_ecac2378()	(machine_arch_type == MACH_TYPE_ECAC2378)
-#else
-# define machine_is_ecac2378()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TAZKIOSK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TAZKIOSK
-# endif
-# define machine_is_tazkiosk()	(machine_arch_type == MACH_TYPE_TAZKIOSK)
-#else
-# define machine_is_tazkiosk()	(0)
-#endif
-
-#ifdef CONFIG_MACH_WHITERABBIT_MCH
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WHITERABBIT_MCH
-# endif
-# define machine_is_whiterabbit_mch()	(machine_arch_type == MACH_TYPE_WHITERABBIT_MCH)
-#else
-# define machine_is_whiterabbit_mch()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SBOX9263
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SBOX9263
-# endif
-# define machine_is_sbox9263()	(machine_arch_type == MACH_TYPE_SBOX9263)
-#else
-# define machine_is_sbox9263()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OREO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OREO
-# endif
-# define machine_is_oreo()	(machine_arch_type == MACH_TYPE_OREO)
-#else
-# define machine_is_oreo()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SMDK6442
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SMDK6442
-# endif
-# define machine_is_smdk6442()	(machine_arch_type == MACH_TYPE_SMDK6442)
-#else
-# define machine_is_smdk6442()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OPENRD_BASE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OPENRD_BASE
-# endif
-# define machine_is_openrd_base()	(machine_arch_type == MACH_TYPE_OPENRD_BASE)
-#else
-# define machine_is_openrd_base()	(0)
-#endif
-
-#ifdef CONFIG_MACH_INCREDIBLE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_INCREDIBLE
-# endif
-# define machine_is_incredible()	(machine_arch_type == MACH_TYPE_INCREDIBLE)
-#else
-# define machine_is_incredible()	(0)
-#endif
-
-#ifdef CONFIG_MACH_INCREDIBLEC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_INCREDIBLEC
-# endif
-# define machine_is_incrediblec()	(machine_arch_type == MACH_TYPE_INCREDIBLEC)
-#else
-# define machine_is_incrediblec()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HEROCT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HEROCT
-# endif
-# define machine_is_heroct()	(machine_arch_type == MACH_TYPE_HEROCT)
-#else
-# define machine_is_heroct()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MMNET1000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MMNET1000
-# endif
-# define machine_is_mmnet1000()	(machine_arch_type == MACH_TYPE_MMNET1000)
-#else
-# define machine_is_mmnet1000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DEVKIT8000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DEVKIT8000
-# endif
-# define machine_is_devkit8000()	(machine_arch_type == MACH_TYPE_DEVKIT8000)
-#else
-# define machine_is_devkit8000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DEVKIT9000
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DEVKIT9000
-# endif
-# define machine_is_devkit9000()	(machine_arch_type == MACH_TYPE_DEVKIT9000)
-#else
-# define machine_is_devkit9000()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX31TXTR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX31TXTR
-# endif
-# define machine_is_mx31txtr()	(machine_arch_type == MACH_TYPE_MX31TXTR)
-#else
-# define machine_is_mx31txtr()	(0)
-#endif
-
-#ifdef CONFIG_MACH_U380
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_U380
-# endif
-# define machine_is_u380()	(machine_arch_type == MACH_TYPE_U380)
-#else
-# define machine_is_u380()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HUALU_BOARD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HUALU_BOARD
-# endif
-# define machine_is_oamp3_hualu()	(machine_arch_type == MACH_TYPE_HUALU_BOARD)
-#else
-# define machine_is_oamp3_hualu()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NPCMX50
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NPCMX50
-# endif
-# define machine_is_npcmx50()	(machine_arch_type == MACH_TYPE_NPCMX50)
-#else
-# define machine_is_npcmx50()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX51_LANGE51
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX51_LANGE51
-# endif
-# define machine_is_mx51_lange51()	(machine_arch_type == MACH_TYPE_MX51_LANGE51)
-#else
-# define machine_is_mx51_lange51()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX51_LANGE52
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX51_LANGE52
-# endif
-# define machine_is_mx51_lange52()	(machine_arch_type == MACH_TYPE_MX51_LANGE52)
-#else
-# define machine_is_mx51_lange52()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RIOM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RIOM
-# endif
-# define machine_is_riom()	(machine_arch_type == MACH_TYPE_RIOM)
-#else
-# define machine_is_riom()	(0)
-#endif
-
-#ifdef CONFIG_MACH_COMCAS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_COMCAS
-# endif
-# define machine_is_comcas()	(machine_arch_type == MACH_TYPE_COMCAS)
-#else
-# define machine_is_comcas()	(0)
-#endif
-
-#ifdef CONFIG_MACH_WSI_MX27
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WSI_MX27
-# endif
-# define machine_is_wsi_mx27()	(machine_arch_type == MACH_TYPE_WSI_MX27)
-#else
-# define machine_is_wsi_mx27()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CM_T35
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CM_T35
-# endif
-# define machine_is_cm_t35()	(machine_arch_type == MACH_TYPE_CM_T35)
-#else
-# define machine_is_cm_t35()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NET2BIG
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NET2BIG
-# endif
-# define machine_is_net2big()	(machine_arch_type == MACH_TYPE_NET2BIG)
-#else
-# define machine_is_net2big()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MOTOROLA_A1600
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MOTOROLA_A1600
-# endif
-# define machine_is_motorola_a1600()	(machine_arch_type == MACH_TYPE_MOTOROLA_A1600)
-#else
-# define machine_is_motorola_a1600()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IGEP0020
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IGEP0020
-# endif
-# define machine_is_igep0020()	(machine_arch_type == MACH_TYPE_IGEP0020)
-#else
-# define machine_is_igep0020()	(0)
-#endif
-
-#ifdef CONFIG_MACH_IGEP0010
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_IGEP0010
-# endif
-# define machine_is_igep0010()	(machine_arch_type == MACH_TYPE_IGEP0010)
-#else
-# define machine_is_igep0010()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MV6281GTWGE2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MV6281GTWGE2
-# endif
-# define machine_is_mv6281gtwge2()	(machine_arch_type == MACH_TYPE_MV6281GTWGE2)
-#else
-# define machine_is_mv6281gtwge2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SCAT100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SCAT100
-# endif
-# define machine_is_scat100()	(machine_arch_type == MACH_TYPE_SCAT100)
-#else
-# define machine_is_scat100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SANMINA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SANMINA
-# endif
-# define machine_is_sanmina()	(machine_arch_type == MACH_TYPE_SANMINA)
-#else
-# define machine_is_sanmina()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MOMENTO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MOMENTO
-# endif
-# define machine_is_momento()	(machine_arch_type == MACH_TYPE_MOMENTO)
-#else
-# define machine_is_momento()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NUC9XX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NUC9XX
-# endif
-# define machine_is_nuc9xx()	(machine_arch_type == MACH_TYPE_NUC9XX)
-#else
-# define machine_is_nuc9xx()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NUC910EVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NUC910EVB
-# endif
-# define machine_is_nuc910evb()	(machine_arch_type == MACH_TYPE_NUC910EVB)
-#else
-# define machine_is_nuc910evb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NUC920EVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NUC920EVB
-# endif
-# define machine_is_nuc920evb()	(machine_arch_type == MACH_TYPE_NUC920EVB)
-#else
-# define machine_is_nuc920evb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NUC950EVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NUC950EVB
-# endif
-# define machine_is_nuc950evb()	(machine_arch_type == MACH_TYPE_NUC950EVB)
-#else
-# define machine_is_nuc950evb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NUC945EVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NUC945EVB
-# endif
-# define machine_is_nuc945evb()	(machine_arch_type == MACH_TYPE_NUC945EVB)
-#else
-# define machine_is_nuc945evb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NUC960EVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NUC960EVB
-# endif
-# define machine_is_nuc960evb()	(machine_arch_type == MACH_TYPE_NUC960EVB)
-#else
-# define machine_is_nuc960evb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NUC932EVB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NUC932EVB
-# endif
-# define machine_is_nuc932evb()	(machine_arch_type == MACH_TYPE_NUC932EVB)
-#else
-# define machine_is_nuc932evb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NUC900
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NUC900
-# endif
-# define machine_is_nuc900()	(machine_arch_type == MACH_TYPE_NUC900)
-#else
-# define machine_is_nuc900()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SD1SOC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SD1SOC
-# endif
-# define machine_is_sd1soc()	(machine_arch_type == MACH_TYPE_SD1SOC)
-#else
-# define machine_is_sd1soc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LN2440BC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LN2440BC
-# endif
-# define machine_is_ln2440bc()	(machine_arch_type == MACH_TYPE_LN2440BC)
-#else
-# define machine_is_ln2440bc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RSBC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RSBC
-# endif
-# define machine_is_rsbc()	(machine_arch_type == MACH_TYPE_RSBC)
-#else
-# define machine_is_rsbc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OPENRD_CLIENT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OPENRD_CLIENT
-# endif
-# define machine_is_openrd_client()	(machine_arch_type == MACH_TYPE_OPENRD_CLIENT)
-#else
-# define machine_is_openrd_client()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HPIPAQ11X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HPIPAQ11X
-# endif
-# define machine_is_hpipaq11x()	(machine_arch_type == MACH_TYPE_HPIPAQ11X)
-#else
-# define machine_is_hpipaq11x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_WAYLAND
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WAYLAND
-# endif
-# define machine_is_wayland()	(machine_arch_type == MACH_TYPE_WAYLAND)
-#else
-# define machine_is_wayland()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ACNBSX102
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ACNBSX102
-# endif
-# define machine_is_acnbsx102()	(machine_arch_type == MACH_TYPE_ACNBSX102)
-#else
-# define machine_is_acnbsx102()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HWAT91
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HWAT91
-# endif
-# define machine_is_hwat91()	(machine_arch_type == MACH_TYPE_HWAT91)
-#else
-# define machine_is_hwat91()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AT91SAM9263CS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AT91SAM9263CS
-# endif
-# define machine_is_at91sam9263cs()	(machine_arch_type == MACH_TYPE_AT91SAM9263CS)
-#else
-# define machine_is_at91sam9263cs()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CSB732
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CSB732
-# endif
-# define machine_is_csb732()	(machine_arch_type == MACH_TYPE_CSB732)
-#else
-# define machine_is_csb732()	(0)
-#endif
-
-#ifdef CONFIG_MACH_U8500
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_U8500
-# endif
-# define machine_is_u8500()	(machine_arch_type == MACH_TYPE_U8500)
-#else
-# define machine_is_u8500()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HUQIU
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HUQIU
-# endif
-# define machine_is_huqiu()	(machine_arch_type == MACH_TYPE_HUQIU)
-#else
-# define machine_is_huqiu()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX51_KUNLUN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX51_KUNLUN
-# endif
-# define machine_is_mx51_kunlun()	(machine_arch_type == MACH_TYPE_MX51_KUNLUN)
-#else
-# define machine_is_mx51_kunlun()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PMT1G
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PMT1G
-# endif
-# define machine_is_pmt1g()	(machine_arch_type == MACH_TYPE_PMT1G)
-#else
-# define machine_is_pmt1g()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTCELF
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTCELF
-# endif
-# define machine_is_htcelf()	(machine_arch_type == MACH_TYPE_HTCELF)
-#else
-# define machine_is_htcelf()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARMADILLO420
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARMADILLO420
-# endif
-# define machine_is_armadillo420()	(machine_arch_type == MACH_TYPE_ARMADILLO420)
-#else
-# define machine_is_armadillo420()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ARMADILLO440
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ARMADILLO440
-# endif
-# define machine_is_armadillo440()	(machine_arch_type == MACH_TYPE_ARMADILLO440)
-#else
-# define machine_is_armadillo440()	(0)
-#endif
-
-#ifdef CONFIG_MACH_U_CHIP_DUAL_ARM
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_U_CHIP_DUAL_ARM
-# endif
-# define machine_is_u_chip_dual_arm()	(machine_arch_type == MACH_TYPE_U_CHIP_DUAL_ARM)
-#else
-# define machine_is_u_chip_dual_arm()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CSR_BDB3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CSR_BDB3
-# endif
-# define machine_is_csr_bdb3()	(machine_arch_type == MACH_TYPE_CSR_BDB3)
-#else
-# define machine_is_csr_bdb3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DOLBY_CAT1018
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DOLBY_CAT1018
-# endif
-# define machine_is_dolby_cat1018()	(machine_arch_type == MACH_TYPE_DOLBY_CAT1018)
-#else
-# define machine_is_dolby_cat1018()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HY9307
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HY9307
-# endif
-# define machine_is_hy9307()	(machine_arch_type == MACH_TYPE_HY9307)
-#else
-# define machine_is_hy9307()	(0)
-#endif
-
-#ifdef CONFIG_MACH_A_ES
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_A_ES
-# endif
-# define machine_is_aspire_easystore()	(machine_arch_type == MACH_TYPE_A_ES)
-#else
-# define machine_is_aspire_easystore()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_IRIF
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DAVINCI_IRIF
-# endif
-# define machine_is_davinci_irif()	(machine_arch_type == MACH_TYPE_DAVINCI_IRIF)
-#else
-# define machine_is_davinci_irif()	(0)
-#endif
-
-#ifdef CONFIG_MACH_AGAMA9263
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_AGAMA9263
-# endif
-# define machine_is_agama9263()	(machine_arch_type == MACH_TYPE_AGAMA9263)
-#else
-# define machine_is_agama9263()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MARVELL_JASPER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MARVELL_JASPER
-# endif
-# define machine_is_marvell_jasper()	(machine_arch_type == MACH_TYPE_MARVELL_JASPER)
-#else
-# define machine_is_marvell_jasper()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FLINT
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FLINT
-# endif
-# define machine_is_flint()	(machine_arch_type == MACH_TYPE_FLINT)
-#else
-# define machine_is_flint()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TAVOREVB3
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TAVOREVB3
-# endif
-# define machine_is_tavorevb3()	(machine_arch_type == MACH_TYPE_TAVOREVB3)
-#else
-# define machine_is_tavorevb3()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SCH_M490
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SCH_M490
-# endif
-# define machine_is_sch_m490()	(machine_arch_type == MACH_TYPE_SCH_M490)
-#else
-# define machine_is_sch_m490()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RBL01
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RBL01
-# endif
-# define machine_is_rbl01()	(machine_arch_type == MACH_TYPE_RBL01)
-#else
-# define machine_is_rbl01()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMNIFI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMNIFI
-# endif
-# define machine_is_omnifi()	(machine_arch_type == MACH_TYPE_OMNIFI)
-#else
-# define machine_is_omnifi()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OTAVALO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OTAVALO
-# endif
-# define machine_is_otavalo()	(machine_arch_type == MACH_TYPE_OTAVALO)
-#else
-# define machine_is_otavalo()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SIENNA
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SIENNA
-# endif
-# define machine_is_sienna()	(machine_arch_type == MACH_TYPE_SIENNA)
-#else
-# define machine_is_sienna()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTC_EXCALIBUR_S620
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTC_EXCALIBUR_S620
-# endif
-# define machine_is_htc_excalibur_s620()	(machine_arch_type == MACH_TYPE_HTC_EXCALIBUR_S620)
-#else
-# define machine_is_htc_excalibur_s620()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HTC_OPAL
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HTC_OPAL
-# endif
-# define machine_is_htc_opal()	(machine_arch_type == MACH_TYPE_HTC_OPAL)
-#else
-# define machine_is_htc_opal()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TOUCHBOOK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TOUCHBOOK
-# endif
-# define machine_is_touchbook()	(machine_arch_type == MACH_TYPE_TOUCHBOOK)
-#else
-# define machine_is_touchbook()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LATTE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LATTE
-# endif
-# define machine_is_latte()	(machine_arch_type == MACH_TYPE_LATTE)
-#else
-# define machine_is_latte()	(0)
-#endif
-
-#ifdef CONFIG_MACH_XA200
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_XA200
-# endif
-# define machine_is_xa200()	(machine_arch_type == MACH_TYPE_XA200)
-#else
-# define machine_is_xa200()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NIMROD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NIMROD
-# endif
-# define machine_is_nimrod()	(machine_arch_type == MACH_TYPE_NIMROD)
-#else
-# define machine_is_nimrod()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CC9P9215_3G
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CC9P9215_3G
-# endif
-# define machine_is_cc9p9215_3g()	(machine_arch_type == MACH_TYPE_CC9P9215_3G)
-#else
-# define machine_is_cc9p9215_3g()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CC9P9215_3GJS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CC9P9215_3GJS
-# endif
-# define machine_is_cc9p9215_3gjs()	(machine_arch_type == MACH_TYPE_CC9P9215_3GJS)
-#else
-# define machine_is_cc9p9215_3gjs()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TK71
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TK71
-# endif
-# define machine_is_tk71()	(machine_arch_type == MACH_TYPE_TK71)
-#else
-# define machine_is_tk71()	(0)
-#endif
-
-#ifdef CONFIG_MACH_COMHAM3525
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_COMHAM3525
-# endif
-# define machine_is_comham3525()	(machine_arch_type == MACH_TYPE_COMHAM3525)
-#else
-# define machine_is_comham3525()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX31EREBUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX31EREBUS
-# endif
-# define machine_is_mx31erebus()	(machine_arch_type == MACH_TYPE_MX31EREBUS)
-#else
-# define machine_is_mx31erebus()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MCARDMX27
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MCARDMX27
-# endif
-# define machine_is_mcardmx27()	(machine_arch_type == MACH_TYPE_MCARDMX27)
-#else
-# define machine_is_mcardmx27()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PARADISE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PARADISE
-# endif
-# define machine_is_paradise()	(machine_arch_type == MACH_TYPE_PARADISE)
-#else
-# define machine_is_paradise()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TIDE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TIDE
-# endif
-# define machine_is_tide()	(machine_arch_type == MACH_TYPE_TIDE)
-#else
-# define machine_is_tide()	(0)
-#endif
-
-#ifdef CONFIG_MACH_WZL2440
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_WZL2440
-# endif
-# define machine_is_wzl2440()	(machine_arch_type == MACH_TYPE_WZL2440)
-#else
-# define machine_is_wzl2440()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SDRDEMO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SDRDEMO
-# endif
-# define machine_is_sdrdemo()	(machine_arch_type == MACH_TYPE_SDRDEMO)
-#else
-# define machine_is_sdrdemo()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ETHERCAN2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ETHERCAN2
-# endif
-# define machine_is_ethercan2()	(machine_arch_type == MACH_TYPE_ETHERCAN2)
-#else
-# define machine_is_ethercan2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_ECMIMG20
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_ECMIMG20
-# endif
-# define machine_is_ecmimg20()	(machine_arch_type == MACH_TYPE_ECMIMG20)
-#else
-# define machine_is_ecmimg20()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP_DRAGON
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP_DRAGON
-# endif
-# define machine_is_omap_dragon()	(machine_arch_type == MACH_TYPE_OMAP_DRAGON)
-#else
-# define machine_is_omap_dragon()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HALO
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HALO
-# endif
-# define machine_is_halo()	(machine_arch_type == MACH_TYPE_HALO)
-#else
-# define machine_is_halo()	(0)
-#endif
-
-#ifdef CONFIG_MACH_HUANGSHAN
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_HUANGSHAN
-# endif
-# define machine_is_huangshan()	(machine_arch_type == MACH_TYPE_HUANGSHAN)
-#else
-# define machine_is_huangshan()	(0)
-#endif
-
-#ifdef CONFIG_MACH_VL_MA2SC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_VL_MA2SC
-# endif
-# define machine_is_vl_ma2sc()	(machine_arch_type == MACH_TYPE_VL_MA2SC)
-#else
-# define machine_is_vl_ma2sc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RAUMFELD_RC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RAUMFELD_RC
-# endif
-# define machine_is_raumfeld_rc()	(machine_arch_type == MACH_TYPE_RAUMFELD_RC)
-#else
-# define machine_is_raumfeld_rc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RAUMFELD_CONNECTOR
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RAUMFELD_CONNECTOR
-# endif
-# define machine_is_raumfeld_connector()	(machine_arch_type == MACH_TYPE_RAUMFELD_CONNECTOR)
-#else
-# define machine_is_raumfeld_connector()	(0)
-#endif
-
-#ifdef CONFIG_MACH_RAUMFELD_SPEAKER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_RAUMFELD_SPEAKER
-# endif
-# define machine_is_raumfeld_speaker()	(machine_arch_type == MACH_TYPE_RAUMFELD_SPEAKER)
-#else
-# define machine_is_raumfeld_speaker()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MULTIBUS_MASTER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MULTIBUS_MASTER
-# endif
-# define machine_is_multibus_master()	(machine_arch_type == MACH_TYPE_MULTIBUS_MASTER)
-#else
-# define machine_is_multibus_master()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MULTIBUS_PBK
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MULTIBUS_PBK
-# endif
-# define machine_is_multibus_pbk()	(machine_arch_type == MACH_TYPE_MULTIBUS_PBK)
-#else
-# define machine_is_multibus_pbk()	(0)
-#endif
-
-#ifdef CONFIG_MACH_TNETV107X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_TNETV107X
-# endif
-# define machine_is_tnetv107x()	(machine_arch_type == MACH_TYPE_TNETV107X)
-#else
-# define machine_is_tnetv107x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SNAKE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SNAKE
-# endif
-# define machine_is_snake()	(machine_arch_type == MACH_TYPE_SNAKE)
-#else
-# define machine_is_snake()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CWMX27
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CWMX27
-# endif
-# define machine_is_cwmx27()	(machine_arch_type == MACH_TYPE_CWMX27)
-#else
-# define machine_is_cwmx27()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SCH_M480
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SCH_M480
-# endif
-# define machine_is_sch_m480()	(machine_arch_type == MACH_TYPE_SCH_M480)
-#else
-# define machine_is_sch_m480()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PLATYPUS
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PLATYPUS
-# endif
-# define machine_is_platypus()	(machine_arch_type == MACH_TYPE_PLATYPUS)
-#else
-# define machine_is_platypus()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PSS2
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PSS2
-# endif
-# define machine_is_pss2()	(machine_arch_type == MACH_TYPE_PSS2)
-#else
-# define machine_is_pss2()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_APM150
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DAVINCI_APM150
-# endif
-# define machine_is_davinci_apm150()	(machine_arch_type == MACH_TYPE_DAVINCI_APM150)
-#else
-# define machine_is_davinci_apm150()	(0)
-#endif
-
-#ifdef CONFIG_MACH_STR9100
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_STR9100
-# endif
-# define machine_is_str9100()	(machine_arch_type == MACH_TYPE_STR9100)
-#else
-# define machine_is_str9100()	(0)
-#endif
-
-#ifdef CONFIG_MACH_NET5BIG
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_NET5BIG
-# endif
-# define machine_is_net5big()	(machine_arch_type == MACH_TYPE_NET5BIG)
-#else
-# define machine_is_net5big()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SEABED9263
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SEABED9263
-# endif
-# define machine_is_seabed9263()	(machine_arch_type == MACH_TYPE_SEABED9263)
-#else
-# define machine_is_seabed9263()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MX51_M2ID
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MX51_M2ID
-# endif
-# define machine_is_mx51_m2id()	(machine_arch_type == MACH_TYPE_MX51_M2ID)
-#else
-# define machine_is_mx51_m2id()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OCTVOCPLUS_EB
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OCTVOCPLUS_EB
-# endif
-# define machine_is_octvocplus_eb()	(machine_arch_type == MACH_TYPE_OCTVOCPLUS_EB)
-#else
-# define machine_is_octvocplus_eb()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KLK_FIREFOX
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KLK_FIREFOX
-# endif
-# define machine_is_klk_firefox()	(machine_arch_type == MACH_TYPE_KLK_FIREFOX)
-#else
-# define machine_is_klk_firefox()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KLK_WIRMA_MODULE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KLK_WIRMA_MODULE
-# endif
-# define machine_is_klk_wirma_module()	(machine_arch_type == MACH_TYPE_KLK_WIRMA_MODULE)
-#else
-# define machine_is_klk_wirma_module()	(0)
-#endif
-
-#ifdef CONFIG_MACH_KLK_WIRMA_MMI
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_KLK_WIRMA_MMI
-# endif
-# define machine_is_klk_wirma_mmi()	(machine_arch_type == MACH_TYPE_KLK_WIRMA_MMI)
-#else
-# define machine_is_klk_wirma_mmi()	(0)
-#endif
-
-#ifdef CONFIG_MACH_SUPERSONIC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_SUPERSONIC
-# endif
-# define machine_is_supersonic()	(machine_arch_type == MACH_TYPE_SUPERSONIC)
-#else
-# define machine_is_supersonic()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LIBERTY
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LIBERTY
-# endif
-# define machine_is_liberty()	(machine_arch_type == MACH_TYPE_LIBERTY)
-#else
-# define machine_is_liberty()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MH355
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MH355
-# endif
-# define machine_is_mh355()	(machine_arch_type == MACH_TYPE_MH355)
-#else
-# define machine_is_mh355()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PC7802
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PC7802
-# endif
-# define machine_is_pc7802()	(machine_arch_type == MACH_TYPE_PC7802)
-#else
-# define machine_is_pc7802()	(0)
-#endif
-
-#ifdef CONFIG_MACH_GNET_SGC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_GNET_SGC
-# endif
-# define machine_is_gnet_sgc()	(machine_arch_type == MACH_TYPE_GNET_SGC)
-#else
-# define machine_is_gnet_sgc()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EINSTEIN15
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EINSTEIN15
-# endif
-# define machine_is_einstein15()	(machine_arch_type == MACH_TYPE_EINSTEIN15)
-#else
-# define machine_is_einstein15()	(0)
-#endif
-
-#ifdef CONFIG_MACH_CMPD
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_CMPD
-# endif
-# define machine_is_cmpd()	(machine_arch_type == MACH_TYPE_CMPD)
-#else
-# define machine_is_cmpd()	(0)
-#endif
-
-#ifdef CONFIG_MACH_DAVINCI_HASE1
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_DAVINCI_HASE1
-# endif
-# define machine_is_davinci_hase1()	(machine_arch_type == MACH_TYPE_DAVINCI_HASE1)
-#else
-# define machine_is_davinci_hase1()	(0)
-#endif
-
-#ifdef CONFIG_MACH_LGEINCITEPHONE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_LGEINCITEPHONE
-# endif
-# define machine_is_lgeincitephone()	(machine_arch_type == MACH_TYPE_LGEINCITEPHONE)
-#else
-# define machine_is_lgeincitephone()	(0)
-#endif
-
-#ifdef CONFIG_MACH_EA313X
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_EA313X
-# endif
-# define machine_is_ea313x()	(machine_arch_type == MACH_TYPE_EA313X)
-#else
-# define machine_is_ea313x()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FWBD_39064
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FWBD_39064
-# endif
-# define machine_is_fwbd_39064()	(machine_arch_type == MACH_TYPE_FWBD_39064)
-#else
-# define machine_is_fwbd_39064()	(0)
-#endif
-
-#ifdef CONFIG_MACH_FWBD_390128
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_FWBD_390128
-# endif
-# define machine_is_fwbd_390128()	(machine_arch_type == MACH_TYPE_FWBD_390128)
-#else
-# define machine_is_fwbd_390128()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PELCO_MOE
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PELCO_MOE
-# endif
-# define machine_is_pelco_moe()	(machine_arch_type == MACH_TYPE_PELCO_MOE)
-#else
-# define machine_is_pelco_moe()	(0)
-#endif
-
-#ifdef CONFIG_MACH_MINIMIX27
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_MINIMIX27
-# endif
-# define machine_is_minimix27()	(machine_arch_type == MACH_TYPE_MINIMIX27)
-#else
-# define machine_is_minimix27()	(0)
-#endif
-
-#ifdef CONFIG_MACH_OMAP3_THUNDER
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_OMAP3_THUNDER
-# endif
-# define machine_is_omap3_thunder()	(machine_arch_type == MACH_TYPE_OMAP3_THUNDER)
-#else
-# define machine_is_omap3_thunder()	(0)
-#endif
-
-#ifdef CONFIG_MACH_PASSIONC
-# ifdef machine_arch_type
-#  undef machine_arch_type
-#  define machine_arch_type	__machine_arch_type
-# else
-#  define machine_arch_type	MACH_TYPE_PASSIONC
-# endif
-# define machine_is_passionc()	(machine_arch_type == MACH_TYPE_PASSIONC)
-#else
-# define machine_is_passionc()	(0)
-#endif
-
-/*
- * These have not yet been registered
- */
-
-#ifndef machine_arch_type
-#define machine_arch_type	__machine_arch_type
-#endif
-
-#endif