From: Tony Lindgren <tony@atomide.com>
Date: Fri, 12 May 2006 11:38:29 +0000 (-0700)
Subject: Merge with /home/tmlind/src/kernel/linux-2.6
X-Git-Tag: v2.6.17-omap1~79
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=236fbebbe8358618954dcff04162dfbcba89a080;p=linux-2.6-omap-h63xx.git

Merge with /home/tmlind/src/kernel/linux-2.6
---

236fbebbe8358618954dcff04162dfbcba89a080
diff --cc drivers/net/irda/Makefile
index a18d18ef63c,c1ce2398efe..ddf3c2e3289
--- a/drivers/net/irda/Makefile
+++ b/drivers/net/irda/Makefile
@@@ -44,8 -44,6 +44,8 @@@ obj-$(CONFIG_MCP2120_DONGLE)	+= mcp2120
  obj-$(CONFIG_ACT200L_DONGLE)	+= act200l-sir.o
  obj-$(CONFIG_MA600_DONGLE)	+= ma600-sir.o
  obj-$(CONFIG_TOIM3232_DONGLE)	+= toim3232-sir.o
 +obj-$(CONFIG_OMAP_IR)		+= omap-ir.o
 +
  
  # The SIR helper module
- sir-dev-objs := sir_dev.o sir_dongle.o sir_kthread.o
+ sir-dev-objs := sir_dev.o sir_dongle.o
diff --cc drivers/serial/8250.c
index 1d212bae03b,bbf78aaf9e0..14c0fcd6af6
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@@ -1930,12 -1934,10 +1959,15 @@@ static int serial8250_request_std_resou
  	unsigned int size = 8 << up->port.regshift;
  	int ret = 0;
  
 +#ifdef CONFIG_ARCH_OMAP
 +	if (is_omap_port((unsigned int)up->port.membase))
 +		size = 0x16 << up->port.regshift;
 +#endif
 +
  	switch (up->port.iotype) {
+ 	case UPIO_AU:
+ 		size = 0x100000;
+ 		/* fall thru */
  	case UPIO_MEM:
  		if (!up->port.mapbase)
  			break;