From: Tony Lindgren <tony@atomide.com>
Date: Mon, 7 Aug 2006 08:13:47 +0000 (+0300)
Subject: Merge with /home/tmlind/src/kernel/linux-2.6
X-Git-Tag: v2.6.18-omap1~120
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=617dbdff765fb0faea0e91d310dbe8f54f89aca3;p=linux-2.6-omap-h63xx.git

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

617dbdff765fb0faea0e91d310dbe8f54f89aca3
diff --cc drivers/char/Kconfig
index ce10a660207,c40e487d9f5..4ec6cf3a7f9
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@@ -670,31 -687,8 +687,18 @@@ config NWFLAS
  
  	  If you're not sure, say N.
  
- config HW_RANDOM
- 	tristate "Intel/AMD/VIA HW Random Number Generator support"
- 	depends on (X86 || IA64) && PCI
- 	---help---
- 	  This driver provides kernel-side support for the Random Number
- 	  Generator hardware found on Intel i8xx-based motherboards,
- 	  AMD 76x-based motherboards, and Via Nehemiah CPUs.
- 
- 	  Provides a character driver, used to read() entropy data.
- 
- 	  To compile this driver as a module, choose M here: the
- 	  module will be called hw_random.
- 
- 	  If unsure, say N.
+ source "drivers/char/hw_random/Kconfig"
  
 +config OMAP_RNG
 +	tristate "OMAP Random Number Generator support"
 +	depends on ARCH_OMAP16XX || ARCH_OMAP24XX
 +	---help---
 +	  This driver provides kernel-side support for the Random Number
 +	  Generator hardware found on OMAP16xx and OMAP24xx multimedia
 +	  processors.
 +
 +	  If unsure, say N.
 +
  config NVRAM
  	tristate "/dev/nvram support"
  	depends on ATARI || X86 || ARM || GENERIC_NVRAM
diff --cc drivers/net/irda/Kconfig
index add31991a2b,e9e6d99a9ad..8929c5e7e84
--- a/drivers/net/irda/Kconfig
+++ b/drivers/net/irda/Kconfig
@@@ -348,16 -348,9 +348,16 @@@ config TOSHIBA_FI
  	  To compile it as a module, choose M here: the module will be called
  	  donauboe.
  
 +config OMAP_IR
 +	tristate "OMAP IrDA(SIR/MIR/FIR)"
 +	depends on IRDA && (ARCH_OMAP1 || ARCH_OMAP2)
 +	select GPIOEXPANDER_OMAP if (MACH_OMAP_H3 || MACH_OMAP_H4)
 +        help
 +	  Say Y here if you want to build support for the OMAP IR.
 +
  config AU1000_FIR
  	tristate "Alchemy Au1000 SIR/FIR"
- 	depends on MIPS_AU1000 && IRDA
+ 	depends on SOC_AU1000 && IRDA
  
  config SMC_IRCC_FIR
  	tristate "SMSC IrCC (EXPERIMENTAL)"
diff --cc drivers/net/smc91x.h
index 605863aa8a2,4ec4b4d23ae..00ace8aaccd
--- a/drivers/net/smc91x.h
+++ b/drivers/net/smc91x.h
@@@ -188,9 -206,8 +206,9 @@@ SMC_outw(u16 val, void __iomem *ioaddr
  #define	SMC_IRQ_FLAGS (( \
  		   machine_is_omap_h2() \
  		|| machine_is_omap_h3() \
 +		|| machine_is_omap_h4() \
  		|| (machine_is_omap_innovator() && !cpu_is_omap1510()) \
- 	) ? SA_TRIGGER_FALLING : SA_TRIGGER_RISING)
+ 	) ? IRQF_TRIGGER_FALLING : IRQF_TRIGGER_RISING)
  
  
  #elif	defined(CONFIG_SH_SH4202_MICRODEV)
diff --cc drivers/video/Makefile
index acc05f62e76,481c6c9695f..9948f1db5ef
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@@ -97,9 -101,9 +101,10 @@@ obj-$(CONFIG_FB_PNX4008_DUM_RGB)  += pn
  
  # Platform or fallback drivers go here
  obj-$(CONFIG_FB_VESA)             += vesafb.o
+ obj-$(CONFIG_FB_IMAC)             += imacfb.o
  obj-$(CONFIG_FB_VGA16)            += vga16fb.o vgastate.o
  obj-$(CONFIG_FB_OF)               += offb.o
 +obj-$(CONFIG_FB_OMAP)		  += omap/ cfbcopyarea.o cfbfillrect.o cfbimgblt.o
  
  # the test framebuffer is last
  obj-$(CONFIG_FB_VIRTUAL)          += vfb.o
diff --cc include/asm-arm/dma-mapping.h
index 73945b23dba,55eb4dc3253..04c4785b75f
--- a/include/asm-arm/dma-mapping.h
+++ b/include/asm-arm/dma-mapping.h
@@@ -3,9 -3,7 +3,8 @@@
  
  #ifdef __KERNEL__
  
- #include <linux/config.h>
  #include <linux/mm.h> /* need struct page */
 +#include <linux/device.h>
  
  #include <asm/scatterlist.h>
  
diff --cc include/linux/i2c-id.h
index c930ba739af,9418519a55d..96e6d2d3d3f
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@@ -112,9 -112,11 +112,13 @@@
  #define I2C_DRIVERID_X1205	82	/* Xicor/Intersil X1205 RTC	*/
  #define I2C_DRIVERID_PCF8563	83	/* Philips PCF8563 RTC		*/
  #define I2C_DRIVERID_RS5C372	84	/* Ricoh RS5C372 RTC		*/
+ #define I2C_DRIVERID_BT866	85	/* Conexant bt866 video encoder */
+ #define I2C_DRIVERID_KS0127	86	/* Samsung ks0127 video decoder */
+ #define I2C_DRIVERID_TLV320AIC23B 87	/* TI TLV320AIC23B audio codec  */
+ #define I2C_DRIVERID_ISL1208	88	/* Intersil ISL1208 RTC		*/
  
 +#define I2C_DRIVERID_MISC	99	/* Whatever until sorted out	*/
 +
  #define I2C_DRIVERID_I2CDEV	900
  #define I2C_DRIVERID_ARP        902    /* SMBus ARP Client              */
  #define I2C_DRIVERID_ALERT      903    /* SMBus Alert Responder Client  */