Diff

diff --git a/arch/arm/mach-pxa/clock.c b/arch/arm/mach-pxa/clock.c
index 2f14f06..e614072 100644
--- a/arch/arm/mach-pxa/clock.c
+++ b/arch/arm/mach-pxa/clock.c
@@ -87,9 +87,9 @@ EXPORT_SYMBOL(clk_get_parent);
 
 int clk_set_parent(struct clk *clk, struct clk *parent)
 {
-	down(&clocks_sem);
+	mutex_lock(&clocks_mutex);
 	clk->parent = parent;
-	up(&clocks_sem);
+	mutex_unlock(&clocks_mutex);
 
 	return 0;
 }
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c
index d9546bc..16d7378 100644
--- a/arch/arm/mach-pxa/generic.c
+++ b/arch/arm/mach-pxa/generic.c
@@ -482,25 +482,25 @@ struct platform_device pxa_device_hwuart = {
 
 void __devinit pxa_set_ffuart_info(struct platform_pxa_serial_funcs *info)
 {
-	ffuart_device.dev.platform_data = info;
+	pxa_device_ffuart.dev.platform_data = info;
 }
 EXPORT_SYMBOL(pxa_set_ffuart_info);
 
 void __devinit pxa_set_btuart_info(struct platform_pxa_serial_funcs *info)
 {
-	btuart_device.dev.platform_data = info;
+	pxa_device_btuart.dev.platform_data = info;
 }
 EXPORT_SYMBOL(pxa_set_btuart_info);
 
 void __devinit pxa_set_stuart_info(struct platform_pxa_serial_funcs *info)
 {
-	stuart_device.dev.platform_data = info;
+	pxa_device_stuart.dev.platform_data = info;
 }
 EXPORT_SYMBOL(pxa_set_stuart_info);
 
 void __devinit pxa_set_hwuart_info(struct platform_pxa_serial_funcs *info)
 {
-	hwuart_device.dev.platform_data = info;
+	pxa_device_hwuart.dev.platform_data = info;
 }
 EXPORT_SYMBOL(pxa_set_hwuart_info);
 
diff --git a/arch/arm/mach-pxa/htcblueangel/blueangel.c b/arch/arm/mach-pxa/htcblueangel/blueangel.c
index 471dc57..764717d 100644
--- a/arch/arm/mach-pxa/htcblueangel/blueangel.c
+++ b/arch/arm/mach-pxa/htcblueangel/blueangel.c
@@ -180,7 +180,7 @@ static struct platform_device tsc2200_ts = {
 static void __init blueangel_init_irq( void )
 {
 	/* Initialize standard IRQs */
-	pxa_init_irq();
+	pxa25x_init_irq();
 }
 
 static void ser_stuart_gpio_config(int enable)
@@ -222,8 +222,8 @@ static void __init blueangel_map_io(void)
 	pxa_map_io();
 
 	STISR=0;	/* Disable UART mode of STUART */
-	printk("CKEN=0x%x CKEN11_USB=0x%x\n", CKEN, CKEN11_USB);	
-	pxa_set_cken(CKEN11_USB, 1);
+	printk("CKEN=0x%x CKEN11_USB=0x%x\n", CKEN, CKEN_USB);	
+	pxa_set_cken(CKEN_USB, 1);
 	printk("CKEN=0x%x\n", CKEN);	
 #if 0
 
diff --git a/arch/arm/mach-pxa/htcblueangel/blueangel_dpram.c b/arch/arm/mach-pxa/htcblueangel/blueangel_dpram.c
index db334ac..37e16e3 100644
--- a/arch/arm/mach-pxa/htcblueangel/blueangel_dpram.c
+++ b/arch/arm/mach-pxa/htcblueangel/blueangel_dpram.c
@@ -376,7 +376,7 @@ static struct uart_driver dpram_reg = {
 	.major		= TTY_MAJOR,
 	.minor		= 72,
 	.nr		= 1,
-	.name_base	= 8,
+	//.name_base	= 8,
 };
 
 int __init dpram_init(void)
diff --git a/arch/arm/mach-pxa/htcblueangel/blueangel_lcd.c b/arch/arm/mach-pxa/htcblueangel/blueangel_lcd.c
index 07a5d9e..fe58494 100644
--- a/arch/arm/mach-pxa/htcblueangel/blueangel_lcd.c
+++ b/arch/arm/mach-pxa/htcblueangel/blueangel_lcd.c
@@ -387,7 +387,7 @@ blueangel_lcd_probe(struct platform_device *dev)
 	
 	printk("in blueangel_lcd_probe\n");
 
-	blueangel_lcd_device = lcd_device_register("w100fb", (void *)&blueangel_fb_info, &blueangel_lcd_props);
+	blueangel_lcd_device = lcd_device_register("w100fb", NULL, (void *)&blueangel_fb_info, &blueangel_lcd_props);
 	if (IS_ERR(blueangel_lcd_device)) {
 		return PTR_ERR(blueangel_lcd_device);
 	}
diff --git a/arch/arm/mach-pxa/htcmagician/htcmagician_ts.mod.c b/arch/arm/mach-pxa/htcmagician/htcmagician_ts.mod.c
deleted file mode 100644
index e5bbf0e..0000000
--- a/arch/arm/mach-pxa/htcmagician/htcmagician_ts.mod.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <linux/module.h>
-#include <linux/vermagic.h>
-#include <linux/compiler.h>
-
-MODULE_INFO(vermagic, VERMAGIC_STRING);
-
-struct module __this_module
-__attribute__((section(".gnu.linkonce.this_module"))) = {
- .name = KBUILD_MODNAME,
- .init = init_module,
-#ifdef CONFIG_MODULE_UNLOAD
- .exit = cleanup_module,
-#endif
-};
-
-static const char __module_depends[]
-__attribute_used__
-__attribute__((section(".modinfo"))) =
-"depends=";
-
diff --git a/drivers/mmc/asic3_mmc.c b/drivers/mmc/asic3_mmc.c
index 6b7e3b4..fbb0fcd 100644
--- a/drivers/mmc/asic3_mmc.c
+++ b/drivers/mmc/asic3_mmc.c
@@ -42,9 +42,9 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/mmc/mmc.h>
+#include <linux/mmc/sd.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
-#include <linux/mmc/protocol.h>
 #include <linux/scatterlist.h>
 #include <linux/soc-old.h>
 #include <linux/mfd/asic3_base.h>
diff --git a/sound/soc/pxa/blueangel.c b/sound/soc/pxa/blueangel.c
index 3282b0a..dc969b6 100644
--- a/sound/soc/pxa/blueangel.c
+++ b/sound/soc/pxa/blueangel.c
@@ -185,7 +185,7 @@ static int blueangel_playback_prepare(struct snd_pcm_substream *substream)
 	/* FIXME: ENABLE I2S */
 	SACR0 |= SACR0_BCKD;
 	SACR0 |= SACR0_ENB;
-	pxa_set_cken(CKEN8_I2S, 1);
+	pxa_set_cken(CKEN_I2S, 1);
 
 	return 0;
 }
@@ -195,7 +195,7 @@ static int blueangel_playback_hw_free(struct snd_pcm_substream *substream)
 	/* FIXME: DISABLE I2S */
 	SACR0 &= ~SACR0_ENB;
 	SACR0 &= ~SACR0_BCKD;
-	pxa_set_cken(CKEN8_I2S, 0);
+	pxa_set_cken(CKEN_I2S, 0);
 	return 0;
 }
 
diff --git a/sound/soc/pxa/pxa2xx-ssp.c b/sound/soc/pxa/pxa2xx-ssp.c
index bce0c4c..fa090a6 100644
--- a/sound/soc/pxa/pxa2xx-ssp.c
+++ b/sound/soc/pxa/pxa2xx-ssp.c
@@ -191,9 +191,9 @@ static void pxa2xx_ssp_shutdown(struct snd_pcm_substream *substream)
 }
 
 #if defined (CONFIG_PXA27x)
-static int cken[3] = {CKEN23_SSP1, CKEN3_SSP2, CKEN4_SSP3};
+static int cken[3] = {CKEN_SSP1, CKEN_SSP2, CKEN_SSP3};
 #else
-static int cken[3] = {CKEN3_SSP, CKEN9_NSSP, CKEN10_ASSP};
+static int cken[3] = {CKEN_SSP, CKEN_NSSP, CKEN_ASSP};
 #endif
 
 #ifdef CONFIG_PM