Diff

diff --git a/arch/arm/mach-pxa/htcblueangel/blueangel.c b/arch/arm/mach-pxa/htcblueangel/blueangel.cindex 471dc57..12c083f 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.cindex db334ac..7df0d61 100644--- a/arch/arm/mach-pxa/htcblueangel/blueangel_dpram.c+++ b/arch/arm/mach-pxa/htcblueangel/blueangel_dpram.c@@ -372,11 +372,10 @@ static struct uart_port dpram_port = { static struct uart_driver dpram_reg = { 	.owner		= THIS_MODULE, 	.driver_name	= "DPRAM serial",-	.dev_name	= "ttyS",+	.dev_name	= "ttyBA", 	.major		= TTY_MAJOR, 	.minor		= 72, 	.nr		= 1,-	.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.cindex 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/drivers/mmc/asic3_mmc.c b/drivers/mmc/asic3_mmc.cindex 6b7e3b4..ab6441b 100644--- a/drivers/mmc/asic3_mmc.c+++ b/drivers/mmc/asic3_mmc.c@@ -44,7 +44,7 @@ #include <linux/mmc/mmc.h> #include <linux/mmc/host.h> #include <linux/mmc/card.h>-#include <linux/mmc/protocol.h>+#include <linux/mmc/sd.h> #include <linux/scatterlist.h> #include <linux/soc-old.h> #include <linux/mfd/asic3_base.h>diff --git a/include/linux/tty.h b/include/linux/tty.hindex 6570719..8edc3ae 100644--- a/include/linux/tty.h+++ b/include/linux/tty.h@@ -24,7 +24,7 @@ #define NR_PTYS	CONFIG_LEGACY_PTY_COUNT   /* Number of legacy ptys */ #define NR_UNIX98_PTY_DEFAULT	4096      /* Default maximum for Unix98 ptys */ #define NR_UNIX98_PTY_MAX	(1 << MINORBITS) /* Absolute limit */-#define NR_LDISCS		17+#define NR_LDISCS		18  /* line disciplines */ #define N_TTY		0@@ -45,6 +45,7 @@ #define N_SYNC_PPP	14	/* synchronous PPP */ #define N_HCI		15	/* Bluetooth HCI UART */ #define N_GIGASET_M101	16	/* Siemens Gigaset M101 serial DECT adapter */+#define N_TIHTC		18	/* TI Calypso on HTC Blueangel and Magician */  /*  * This character is the same as _POSIX_VDISABLE: it cannot be used asdiff --git a/sound/soc/pxa/blueangel.c b/sound/soc/pxa/blueangel.cindex 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.cindex 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