]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Manual merge to make things compile after updating to 2.6.18-rc4
authorTony Lindgren <tony@atomide.com>
Mon, 7 Aug 2006 15:09:05 +0000 (18:09 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 7 Aug 2006 15:09:05 +0000 (18:09 +0300)
commit1230366a669d16c7a292586adc7ab0725395f5b4
tree31d065e55169b197ff97702d1aa7c9243a136240
parent617dbdff765fb0faea0e91d310dbe8f54f89aca3
Manual merge to make things compile after updating to 2.6.18-rc4

Some things are probably broken right now with the generic irq
code update.
24 files changed:
arch/arm/kernel/irq.c
arch/arm/mach-omap1/board-osk.c
arch/arm/mach-omap2/timer-gp.c
arch/arm/plat-omap/clock.c
arch/arm/plat-omap/dsp/dsp_core.c
arch/arm/plat-omap/dsp/uaccess_dsp.S
arch/arm/plat-omap/dsp/uaccess_dsp.h
arch/arm/plat-omap/fb.c
arch/arm/plat-omap/gpio-switch.c
arch/arm/plat-omap/gpio.c
arch/arm/plat-omap/timer32k.c
drivers/Kconfig
drivers/bluetooth/brf6150.c
drivers/cbus/retu.c
drivers/cbus/tahvo.c
drivers/char/Makefile
drivers/leds/Kconfig
drivers/leds/Makefile
drivers/mmc/omap.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/Makefile
drivers/usb/host/ohci-omap.c
drivers/video/Kconfig
kernel/printk.c