From: Russell King Date: Tue, 14 Oct 2008 21:24:51 +0000 (+0100) Subject: Merge branch 's3c-move' into devel X-Git-Tag: v2.6.28-rc1~293^2~1 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4;hp=-c;p=linux-2.6-omap-h63xx.git Merge branch 's3c-move' into devel Conflicts: arch/arm/mach-versatile/core.c --- 7e69a8c4d06b7ecb874f571e82b715a9f79bc3c4 diff --combined MAINTAINERS index c77df0f449d,8dae4555f10..4d7de2b44c7 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -271,20 -271,20 +271,20 @@@ W: http://www.lesswatts.org/projects/ac S: Supported ACPI WMI DRIVER - P: Carlos Corbacho - M: carlos@strangeworlds.co.uk - L: linux-acpi@vger.kernel.org - W: http://www.lesswatts.org/projects/acpi/ - S: Maintained + P: Carlos Corbacho + M: carlos@strangeworlds.co.uk + L: linux-acpi@vger.kernel.org + W: http://www.lesswatts.org/projects/acpi/ + S: Maintained AD1889 ALSA SOUND DRIVER - P: Kyle McMartin - M: kyle@mcmartin.ca - P: Thibaut Varene - M: T-Bone@parisc-linux.org - W: http://wiki.parisc-linux.org/AD1889 - L: linux-parisc@vger.kernel.org - S: Maintained + P: Kyle McMartin + M: kyle@mcmartin.ca + P: Thibaut Varene + M: T-Bone@parisc-linux.org + W: http://wiki.parisc-linux.org/AD1889 + L: linux-parisc@vger.kernel.org + S: Maintained ADM1025 HARDWARE MONITOR DRIVER P: Jean Delvare @@@ -466,12 -466,6 +466,12 @@@ M: kernel@wantstofly.or L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) S: Maintained +ARM/AFEB9260 MACHINE SUPPORT +P: Sergey Lapin +M: slapin@ossfans.org +L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) +S: Maintained + ARM/AJECO 1ARM MACHINE SUPPORT P: Lennert Buytenhek M: kernel@wantstofly.org @@@ -479,11 -473,11 +479,11 @@@ L: linux-arm-kernel@lists.arm.linux.org S: Maintained ARM/ATMEL AT91RM9200 ARM ARCHITECTURE - P: Andrew Victor - M: linux@maxim.org.za - L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) - W: http://maxim.org.za/at91_26.html - S: Maintained + P: Andrew Victor + M: linux@maxim.org.za + L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) + W: http://maxim.org.za/at91_26.html + S: Maintained ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE P: Lennert Buytenhek @@@ -497,7 -491,7 +497,7 @@@ M: kernel@wantstofly.or L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) S: Maintained -ARM/COMPULAB CM-X270/EM-X270 MACHINE SUPPORT +ARM/COMPULAB CM-X270/EM-X270 and CM-X300 MACHINE SUPPORT P: Mike Rapoport M: mike@compulab.co.il L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) @@@ -538,10 -532,10 +538,10 @@@ L: linux-arm-kernel@lists.arm.linux.org S: Maintained ARM/HP JORNADA 7XX MACHINE SUPPORT - P: Kristoffer Ericson - M: kristoffer.ericson@gmail.com - W: www.jlime.com - S: Maintained + P: Kristoffer Ericson + M: kristoffer.ericson@gmail.com + W: www.jlime.com + S: Maintained ARM/INTEL IOP32X ARM ARCHITECTURE P: Lennert Buytenhek @@@ -629,12 -623,6 +629,12 @@@ M: marek.vasut@gmail.co W: http://hackndev.com S: Maintained +ARM/PALMZ72 SUPPORT +P: Sergey Lapin +M: slapin@ossfans.org +W: http://hackndev.com +S: Maintained + ARM/PLEB SUPPORT P: Peter Chubb M: pleb@gelato.unsw.edu.au @@@ -1029,7 -1017,7 +1029,7 @@@ T: git kernel.org:/pub/scm/linux/kernel S: Maintained CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER - P: Jonathan Corbet + P: Jonathan Corbet M: corbet@lwn.net L: video4linux-list@redhat.com S: Maintained @@@ -1210,9 -1198,7 +1210,7 @@@ M: hpa@zytor.co S: Maintained CPUSETS - P: Paul Jackson P: Paul Menage - M: pj@sgi.com M: menage@google.com L: linux-kernel@vger.kernel.org W: http://www.bullopensource.org/cpuset/ @@@ -1371,7 -1357,7 +1369,7 @@@ P: Digi International, In M: Eng.Linux@digi.com L: Eng.Linux@digi.com W: http://www.digi.com - S: Orphaned + S: Orphan DIRECTORY NOTIFICATION P: Stephen Rothwell @@@ -1435,12 -1421,12 +1433,12 @@@ L: linux-acpi@vger.kernel.or S: Supported DOCUMENTATION (/Documentation directory) - P: Michael Kerrisk - M: mtk.manpages@gmail.com - P: Randy Dunlap - M: rdunlap@xenotime.net - L: linux-doc@vger.kernel.org - S: Maintained + P: Michael Kerrisk + M: mtk.manpages@gmail.com + P: Randy Dunlap + M: rdunlap@xenotime.net + L: linux-doc@vger.kernel.org + S: Maintained DOUBLETALK DRIVER P: James R. Van Zandt @@@ -1471,7 -1457,7 +1469,7 @@@ S: Maintaine DVB SUBSYSTEM AND DRIVERS P: LinuxTV.org Project M: v4l-dvb-maintainer@linuxtv.org - L: linux-dvb@linuxtv.org (subscription required) + L: linux-dvb@linuxtv.org (subscription required) W: http://linuxtv.org/ T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git S: Maintained @@@ -1809,7 -1795,7 +1807,7 @@@ FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16- P: Rik Faith M: faith@cs.unc.edu L: linux-scsi@vger.kernel.org - S: Odd fixes (e.g., new signatures) + S: Odd Fixes (e.g., new signatures) GDT SCSI DISK ARRAY CONTROLLER DRIVER P: Achim Leubner @@@ -1850,10 -1836,10 +1848,10 @@@ S: Maintaine HARDWARE MONITORING L: lm-sensors@lm-sensors.org W: http://www.lm-sensors.org/ - S: Orphaned + S: Orphan HARDWARE RANDOM NUMBER GENERATOR CORE - S: Orphaned + S: Orphan HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER P: Robert Love @@@ -1996,7 -1982,7 +1994,7 @@@ S: Maintaine I2C/SMBUS STUB DRIVER P: Mark M. Hoffman M: mhoffman@lightlink.com - L: lm-sensors@lm-sensors.org + L: i2c@lm-sensors.org S: Maintained I2C SUBSYSTEM @@@ -2120,7 -2106,7 +2118,7 @@@ M: rolandd@cisco.co P: Sean Hefty M: sean.hefty@intel.com P: Hal Rosenstock - M: hal.rosenstock@gmail.com + M: hal.rosenstock@gmail.com L: general@lists.openfabrics.org W: http://www.openib.org/ T: git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git @@@ -2708,17 -2694,18 +2706,18 @@@ S: Maintaine MARVELL YUKON / SYSKONNECT DRIVER P: Mirko Lindner - M: mlindner@syskonnect.de + M: mlindner@syskonnect.de P: Ralph Roesler - M: rroesler@syskonnect.de - W: http://www.syskonnect.com - S: Supported + M: rroesler@syskonnect.de + W: http://www.syskonnect.com + S: Supported MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7 P: Michael Kerrisk M: mtk.manpages@gmail.com - W: http://www.kernel.org/doc/man-pages - S: Supported + W: http://www.kernel.org/doc/man-pages + L: linux-man@vger.kernel.org + S: Supported MARVELL LIBERTAS WIRELESS DRIVER P: Dan Williams @@@ -2747,7 -2734,7 +2746,7 @@@ S: Maintaine MEGARAID SCSI DRIVERS P: Neela Syam Kolli M: megaraidlinux@lsi.com - S: linux-scsi@vger.kernel.org + L: linux-scsi@vger.kernel.org W: http://megaraid.lsilogic.com S: Maintained @@@ -2865,7 -2852,7 +2864,7 @@@ MULTIMEDIA CARD (MMC) ETC. OVER SP P: David Brownell M: dbrownell@users.sourceforge.net L: linux-kernel@vger.kernel.org - S: Odd fixes + S: Odd Fixes MULTISOUND SOUND DRIVER P: Andrew Veliath @@@ -2879,10 -2866,10 +2878,10 @@@ L: linux-kernel@vger.kernel.or S: Maintained MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER - P: Felipe Balbi - M: felipe.balbi@nokia.com - L: linux-usb@vger.kernel.org - S: Maintained + P: Felipe Balbi + M: felipe.balbi@nokia.com + L: linux-usb@vger.kernel.org + S: Maintained MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE) P: Andrew Gallatin @@@ -2894,7 -2881,7 +2893,7 @@@ W: http://www.myri.com/scs/download-Myr S: Supported NATSEMI ETHERNET DRIVER (DP8381x) - P: Tim Hockin + P: Tim Hockin M: thockin@hockin.org S: Maintained @@@ -3113,7 -3100,7 +3112,7 @@@ M: laforge@gnumonks.or S: Maintained OMNIVISION OV7670 SENSOR DRIVER - P: Jonathan Corbet + P: Jonathan Corbet M: corbet@lwn.net L: video4linux-list@redhat.com S: Maintained @@@ -3223,7 -3210,7 +3222,7 @@@ T: git kernel.org:/pub/scm/linux/kernel S: Supported PCI HOTPLUG CORE - P: Kristen Carlson Accardi + P: Kristen Carlson Accardi M: kristen.c.accardi@intel.com S: Supported @@@ -3662,7 -3649,7 +3661,7 @@@ M: jmorris@namei.or P: Eric Paris M: eparis@parisplace.org L: linux-kernel@vger.kernel.org (kernel issues) - L: selinux@tycho.nsa.gov (subscribers-only, general discussion) + L: selinux@tycho.nsa.gov (subscribers-only, general discussion) W: http://www.nsa.gov/selinux S: Supported @@@ -3738,7 -3725,7 +3737,7 @@@ S: Maintaine SIS 96X I2C/SMBUS DRIVER P: Mark M. Hoffman M: mhoffman@lightlink.com - L: lm-sensors@lm-sensors.org + L: i2c@lm-sensors.org S: Maintained SIS FRAMEBUFFER DRIVER @@@ -3780,10 -3767,10 +3779,10 @@@ M: bn@niasdigital.co S: Maintained SOC-CAMERA V4L2 SUBSYSTEM - P: Guennadi Liakhovetski - M: g.liakhovetski@gmx.de - L: video4linux-list@redhat.com - S: Maintained + P: Guennadi Liakhovetski + M: g.liakhovetski@gmx.de + L: video4linux-list@redhat.com + S: Maintained SOFTWARE RAID (Multiple Disks) SUPPORT P: Ingo Molnar @@@ -3845,11 -3832,12 +3844,12 @@@ S: Maintaine SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT P: Liam Girdwood - M: liam.girdwood@wolfsonmicro.com + M: lrg@slimlogic.co.uk P: Mark Brown M: broonie@opensource.wolfsonmicro.com T: git opensource.wolfsonmicro.com/linux-2.6-asoc L: alsa-devel@alsa-project.org (subscribers-only) + W: http://alsa-project.org/main/index.php/ASoC S: Supported SPI SUBSYSTEM @@@ -3937,7 -3925,7 +3937,7 @@@ S: Maintaine STARMODE RADIO IP (STRIP) PROTOCOL DRIVER W: http://mosquitonet.Stanford.EDU/strip.html - S: Unsupported ? + S: Orphan STRADIS MPEG-2 DECODER DRIVER P: Nathan Laredo @@@ -4018,9 -4006,9 +4018,9 @@@ T: git repo.or.cz/linux-2.6/linux-acpi- S: Maintained TI FLASH MEDIA INTERFACE DRIVER - P: Alex Dubov - M: oakad@yahoo.com - S: Maintained + P: Alex Dubov + M: oakad@yahoo.com + S: Maintained TI OMAP MMC INTERFACE DRIVER P: Carlos Aguiar, Anderson Briglia and Syed Khasim @@@ -4166,13 -4154,13 +4166,13 @@@ USB BLOCK DRIVER (UB ub P: Pete Zaitcev M: zaitcev@redhat.com L: linux-kernel@vger.kernel.org - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org S: Supported USB CDC ETHERNET DRIVER P: Greg Kroah-Hartman M: greg@kroah.com - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org S: Maintained W: http://www.kroah.com/linux-usb/ @@@ -4199,13 -4187,13 +4199,13 @@@ S: Maintaine USB EHCI DRIVER P: David Brownell M: dbrownell@users.sourceforge.net - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org S: Odd Fixes USB ET61X[12]51 DRIVER P: Luca Risolia M: luca.risolia@studio.unibo.it - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org L: video4linux-list@redhat.com W: http://www.linux-projects.org S: Maintained @@@ -4213,33 -4201,33 +4213,33 @@@ USB GADGET/PERIPHERAL SUBSYSTEM P: David Brownell M: dbrownell@users.sourceforge.net - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org W: http://www.linux-usb.org/gadget S: Maintained USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...) P: Jiri Kosina M: jkosina@suse.cz - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org T: git kernel.org:/pub/scm/linux/kernel/git/jikos/hid.git S: Maintained USB ISP116X DRIVER P: Olav Kongas M: ok@artecdesign.ee - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org S: Maintained USB KAWASAKI LSI DRIVER P: Oliver Neukum M: oliver@neukum.name - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org S: Maintained USB MASS STORAGE DRIVER P: Matthew Dharm M: mdharm-usb@one-eyed-alien.net - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org L: usb-storage@lists.one-eyed-alien.net S: Maintained W: http://www.one-eyed-alien.net/~mdharm/linux-usb/ @@@ -4247,26 -4235,26 +4247,26 @@@ USB OHCI DRIVER P: David Brownell M: dbrownell@users.sourceforge.net - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org S: Odd Fixes USB OPTION-CARD DRIVER P: Matthias Urlichs M: smurf@smurf.noris.de - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org S: Maintained USB OV511 DRIVER P: Mark McClelland M: mmcclell@bigfoot.com - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org W: http://alpha.dyndns.org/ov511/ S: Maintained USB PEGASUS DRIVER P: Petko Manolov M: petkan@users.sourceforge.net - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org L: netdev@vger.kernel.org W: http://pegasus2.sourceforge.net/ S: Maintained @@@ -4274,13 -4262,13 +4274,13 @@@ USB PRINTER DRIVER (usblp) P: Pete Zaitcev M: zaitcev@redhat.com - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org S: Supported USB RTL8150 DRIVER P: Petko Manolov M: petkan@users.sourceforge.net - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org L: netdev@vger.kernel.org W: http://pegasus2.sourceforge.net/ S: Maintained @@@ -4288,20 -4276,20 +4288,20 @@@ USB SE401 DRIVER P: Jeroen Vreeken M: pe1rxq@amsat.org - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org W: http://www.chello.nl/~j.vreeken/se401/ S: Maintained USB SERIAL BELKIN F5U103 DRIVER P: William Greathouse M: wgreathouse@smva.com - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org S: Maintained USB SERIAL CYPRESS M8 DRIVER P: Lonnie Mendez M: dignome@gmail.com - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org S: Maintained W: http://geocities.com/i0xox0i W: http://firstlight.net/cvs @@@ -4316,39 -4304,39 +4316,39 @@@ USB SERIAL DIGI ACCELEPORT DRIVE P: Peter Berger and Al Borchers M: pberger@brimson.com M: alborchers@steinerpoint.com - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org S: Maintained USB SERIAL DRIVER P: Greg Kroah-Hartman M: gregkh@suse.de - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org S: Supported USB SERIAL EMPEG EMPEG-CAR MARK I/II DRIVER P: Gary Brubaker M: xavyer@ix.netcom.com - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org S: Maintained USB SERIAL KEYSPAN DRIVER P: Greg Kroah-Hartman M: greg@kroah.com - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org W: http://www.kroah.com/linux/ S: Maintained USB SERIAL WHITEHEAT DRIVER P: Support Department M: support@connecttech.com - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org W: http://www.connecttech.com S: Supported USB SN9C1xx DRIVER P: Luca Risolia M: luca.risolia@studio.unibo.it - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org L: video4linux-list@redhat.com W: http://www.linux-projects.org S: Maintained @@@ -4356,7 -4344,7 +4356,7 @@@ USB SUBSYSTEM P: Greg Kroah-Hartman M: gregkh@suse.de - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org W: http://www.linux-usb.org T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ S: Supported @@@ -4364,7 -4352,7 +4364,7 @@@ USB UHCI DRIVER P: Alan Stern M: stern@rowland.harvard.edu - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org S: Maintained USB "USBNET" DRIVER FRAMEWORK @@@ -4385,7 -4373,7 +4385,7 @@@ S: Maintaine USB W996[87]CF DRIVER P: Luca Risolia M: luca.risolia@studio.unibo.it - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org L: video4linux-list@redhat.com W: http://www.linux-projects.org S: Maintained @@@ -4399,7 -4387,7 +4399,7 @@@ S: Maintaine USB ZC0301 DRIVER P: Luca Risolia M: luca.risolia@studio.unibo.it - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org L: video4linux-list@redhat.com W: http://www.linux-projects.org S: Maintained @@@ -4407,14 -4395,14 +4407,14 @@@ USB ZD1201 DRIVER P: Jeroen Vreeken M: pe1rxq@amsat.org - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org W: http://linux-lc100020.sourceforge.net S: Maintained USB ZR364XX DRIVER P: Antoine Jacquet M: royale@zerezo.com - L: linux-usb@vger.kernel.org + L: linux-usb@vger.kernel.org L: video4linux-list@redhat.com W: http://royale.zerezo.com/zr364xx/ S: Maintained diff --combined arch/arm/Makefile index 94003142082,0e97f5cc541..7d5121260fd --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@@ -47,7 -47,7 +47,7 @@@ comma = # Note that GCC does not numerically define an architecture version # macro, but instead defines a whole series of macros which makes # testing for a specific architecture or later rather impossible. -arch-$(CONFIG_CPU_32v7) :=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7a,-march=armv5t -Wa$(comma)-march=armv7a) +arch-$(CONFIG_CPU_32v7) :=-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a) arch-$(CONFIG_CPU_32v6) :=-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6) # Only override the compiler option if ARMv6. The ARMv6K extensions are # always available in ARMv7 @@@ -118,10 -118,9 +118,10 @@@ endi machine-$(CONFIG_ARCH_IXP23XX) := ixp23xx machine-$(CONFIG_ARCH_OMAP1) := omap1 machine-$(CONFIG_ARCH_OMAP2) := omap2 + machine-$(CONFIG_ARCH_OMAP3) := omap2 plat-$(CONFIG_ARCH_OMAP) := omap machine-$(CONFIG_ARCH_S3C2410) := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443 - plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx + plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx s3c machine-$(CONFIG_ARCH_LH7A40X) := lh7a40x machine-$(CONFIG_ARCH_VERSATILE) := versatile machine-$(CONFIG_ARCH_IMX) := imx diff --combined arch/arm/mach-davinci/psc.c index 42b976e8a7e,aa2fc375a32..58754f066d5 --- a/arch/arm/mach-davinci/psc.c +++ b/arch/arm/mach-davinci/psc.c @@@ -21,8 -21,8 +21,8 @@@ #include #include #include +#include -#include #include #include #include @@@ -70,9 -70,6 +70,6 @@@ void davinci_psc_config(unsigned int do { u32 epcpr, ptcmd, ptstat, pdstat, pdctl1, mdstat, mdctl, mdstat_mask; - if (id < 0) - return; - mdctl = davinci_readl(DAVINCI_PWR_SLEEP_CNTRL_BASE + MDCTL + 4 * id); if (enable) mdctl |= 0x00000003; /* Enable Module */ diff --combined arch/arm/mach-pxa/time.c index 18d14974583,b0d6b32654c..f8a9a62959e --- a/arch/arm/mach-pxa/time.c +++ b/arch/arm/mach-pxa/time.c @@@ -17,9 -17,9 +17,9 @@@ #include #include #include + #include #include - #include #include #include #include @@@ -155,7 -155,7 +155,7 @@@ static void __init pxa_timer_init(void OIER = 0; OSSR = OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3; - if (cpu_is_pxa21x() || cpu_is_pxa25x()) + if (cpu_is_pxa25x()) clock_tick_rate = 3686400; else if (machine_is_mainstone()) clock_tick_rate = 3249600; diff --combined arch/arm/mach-s3c2410/bast-irq.c index 75738000272,cfa8da5f4e1..9a37c87152b --- a/arch/arm/mach-s3c2410/bast-irq.c +++ b/arch/arm/mach-s3c2410/bast-irq.c @@@ -25,12 -25,12 +25,12 @@@ #include #include #include +#include #include #include #include -#include #include @@@ -38,7 -38,7 +38,7 @@@ #include #include - #include + #include #if 0 #include @@@ -130,7 -130,8 +130,7 @@@ bast_irq_pc104_demux(unsigned int irq for (i = 0; stat != 0; i++, stat >>= 1) { if (stat & 1) { irqno = bast_pc104_irqs[i]; - desc = irq_desc + irqno; - desc_handle_irq(irqno, desc); + generic_handle_irq(irqno); } } } diff --combined arch/arm/mach-s3c2410/clock.c index fef646c36b5,c9ac206f349..4e07943c1e2 --- a/arch/arm/mach-s3c2410/clock.c +++ b/arch/arm/mach-s3c2410/clock.c @@@ -31,19 -31,19 +31,19 @@@ #include #include #include +#include #include #include -#include - #include + #include #include #include - #include - #include - #include + #include + #include + #include int s3c2410_clkcon_enable(struct clk *clk, int enable) { diff --combined arch/arm/mach-s3c2410/mach-amlm5900.c index 527f88a288e,c7936c15ec2..d061fea0190 --- a/arch/arm/mach-s3c2410/mach-amlm5900.c +++ b/arch/arm/mach-s3c2410/mach-amlm5900.c @@@ -36,7 -36,6 +36,7 @@@ #include #include #include +#include #include #include @@@ -44,16 -43,17 +44,16 @@@ #include #include -#include #include #include #include - #include + #include #include #include - #include - #include + #include + #include #ifdef CONFIG_MTD_PARTITIONS diff --combined arch/arm/mach-s3c2410/mach-bast.c index e4368e6e7e6,599c0c227b9..8db9c700e3c --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/arch/arm/mach-s3c2410/mach-bast.c @@@ -22,7 -22,6 +22,7 @@@ #include #include #include +#include #include @@@ -35,11 -34,12 +35,11 @@@ #include #include -#include #include #include //#include - #include + #include #include #include #include @@@ -55,9 -55,9 +55,9 @@@ #include - #include - #include - #include + #include + #include + #include #include "usb-simtec.h" #include "nor-simtec.h" diff --combined arch/arm/mach-s3c2410/mach-h1940.c index 85e710f2863,21b36573943..98716d0108e --- a/arch/arm/mach-s3c2410/mach-h1940.c +++ b/arch/arm/mach-s3c2410/mach-h1940.c @@@ -20,17 -20,17 +20,17 @@@ #include #include #include +#include #include #include #include #include -#include #include #include - #include + #include #include #include #include @@@ -40,10 -40,10 +40,10 @@@ #include #include - #include - #include - #include - #include + #include + #include + #include + #include static struct map_desc h1940_iodesc[] __initdata = { [0] = { diff --combined arch/arm/mach-s3c2410/mach-n30.c index 3ece2d04934,b0534ad5bc1..82505517846 --- a/arch/arm/mach-s3c2410/mach-n30.c +++ b/arch/arm/mach-s3c2410/mach-n30.c @@@ -25,9 -25,9 +25,9 @@@ #include #include #include +#include #include -#include #include #include @@@ -41,12 -41,12 +41,12 @@@ #include #include - #include + #include - #include - #include - #include - #include + #include + #include + #include + #include #include static struct map_desc n30_iodesc[] __initdata = { diff --combined arch/arm/mach-s3c2410/mach-otom.c index c4dfe3eabe1,3a32e1636aa..d8255cf87e4 --- a/arch/arm/mach-s3c2410/mach-otom.c +++ b/arch/arm/mach-s3c2410/mach-otom.c @@@ -17,7 -17,6 +17,7 @@@ #include #include #include +#include #include #include @@@ -26,16 -25,17 +26,16 @@@ #include #include -#include #include #include - #include + #include #include - #include - #include - #include - #include + #include + #include + #include + #include static struct map_desc otom11_iodesc[] __initdata = { /* Device area */ diff --combined arch/arm/mach-s3c2410/mach-qt2410.c index 97c13192315,53ad949ef6c..661807e14e8 --- a/arch/arm/mach-s3c2410/mach-qt2410.c +++ b/arch/arm/mach-s3c2410/mach-qt2410.c @@@ -32,7 -32,7 +32,7 @@@ #include #include #include - +#include #include #include #include @@@ -43,22 -43,23 +43,22 @@@ #include #include -#include #include #include #include #include - #include + #include #include #include #include #include #include - #include - #include - #include - #include + #include + #include + #include + #include static struct map_desc qt2410_iodesc[] __initdata = { { 0xe0000000, __phys_to_pfn(S3C2410_CS3+0x01000000), SZ_1M, MT_DEVICE } diff --combined arch/arm/mach-s3c2410/mach-smdk2410.c index d49e58acb03,406cba871c6..152527bb287 --- a/arch/arm/mach-s3c2410/mach-smdk2410.c +++ b/arch/arm/mach-s3c2410/mach-smdk2410.c @@@ -36,22 -36,22 +36,22 @@@ #include #include #include +#include #include #include #include #include -#include #include #include - #include + #include - #include - #include + #include + #include - #include + #include static struct map_desc smdk2410_iodesc[] __initdata = { /* nothing here yet */ diff --combined arch/arm/mach-s3c2410/mach-tct_hammer.c index cc2e79fe4f9,773abd43998..309dcf4c870 --- a/arch/arm/mach-s3c2410/mach-tct_hammer.c +++ b/arch/arm/mach-s3c2410/mach-tct_hammer.c @@@ -33,7 -33,6 +33,7 @@@ #include #include #include +#include #include #include @@@ -41,12 -40,13 +41,12 @@@ #include #include -#include #include #include - #include - #include - #include + #include + #include + #include #ifdef CONFIG_MTD_PARTITIONS diff --combined arch/arm/mach-s3c2410/mach-vr1000.c index ed3acb05c85,99c82079335..941353af16d --- a/arch/arm/mach-s3c2410/mach-vr1000.c +++ b/arch/arm/mach-s3c2410/mach-vr1000.c @@@ -25,7 -25,6 +25,7 @@@ #include #include #include +#include #include #include @@@ -37,16 -36,17 +37,16 @@@ #include #include -#include #include #include - #include + #include #include #include - #include - #include - #include + #include + #include + #include #include "usb-simtec.h" #include "nor-simtec.h" diff --combined arch/arm/mach-s3c2410/pm.c index 733f8a22777,b026cc8dcba..a6970f61319 --- a/arch/arm/mach-s3c2410/pm.c +++ b/arch/arm/mach-s3c2410/pm.c @@@ -25,17 -25,17 +25,17 @@@ #include #include #include +#include #include -#include #include #include #include - #include - #include + #include + #include #ifdef CONFIG_S3C2410_PM_DEBUG extern void pm_dbg(const char *fmt, ...); diff --combined arch/arm/mach-s3c2410/s3c2410.c index b1e658c917a,e84c166a6f6..ac79b536c4c --- a/arch/arm/mach-s3c2410/s3c2410.c +++ b/arch/arm/mach-s3c2410/s3c2410.c @@@ -19,22 -19,22 +19,22 @@@ #include #include #include +#include #include #include #include #include -#include #include #include - #include + #include - #include - #include - #include - #include + #include + #include + #include + #include /* Initial IO mappings */ diff --combined arch/arm/mach-s3c2410/usb-simtec.c index eb6fc0bfd47,a8a2c28722b..6078f09b7df --- a/arch/arm/mach-s3c2410/usb-simtec.c +++ b/arch/arm/mach-s3c2410/usb-simtec.c @@@ -21,7 -21,6 +21,7 @@@ #include #include #include +#include #include #include @@@ -33,9 -32,10 +33,9 @@@ #include #include -#include #include - #include + #include #include "usb-simtec.h" /* control power and monitor over-current events on various Simtec diff --combined arch/arm/mach-s3c2412/clock.c index 5fbaac6054f,8be4cd67738..96d9eb15424 --- a/arch/arm/mach-s3c2412/clock.c +++ b/arch/arm/mach-s3c2412/clock.c @@@ -31,19 -31,19 +31,19 @@@ #include #include #include +#include #include #include -#include - #include + #include #include #include - #include - #include - #include + #include + #include + #include /* We currently have to assume that the system is running * from the XTPll input, and that all ***REFCLKs are being diff --combined arch/arm/mach-s3c2412/dma.c index dcfff6b8b95,6038e9f30ad..ba0591e71f3 --- a/arch/arm/mach-s3c2412/dma.c +++ b/arch/arm/mach-s3c2412/dma.c @@@ -16,15 -16,15 +16,15 @@@ #include #include #include +#include #include #include -#include - #include - #include + #include + #include - #include + #include #include #include #include diff --combined arch/arm/mach-s3c2412/irq.c index 41720f2c1fe,936fac7600e..6000ca9d181 --- a/arch/arm/mach-s3c2412/irq.c +++ b/arch/arm/mach-s3c2412/irq.c @@@ -24,10 -24,10 +24,10 @@@ #include #include #include +#include #include #include -#include #include @@@ -35,9 -35,9 +35,9 @@@ #include #include - #include - #include - #include + #include + #include + #include #define INTMSK(start, end) ((1 << ((end) + 1 - (start))) - 1) #define INTMSK_SUB(start, end) (INTMSK(start, end) << ((start - S3C2410_IRQSUB(0)))) @@@ -123,10 -123,10 +123,10 @@@ static void s3c2412_irq_demux_cfsdi(uns subsrc &= ~submsk; if (subsrc & INTBIT(IRQ_S3C2412_SDI)) - desc_handle_irq(IRQ_S3C2412_SDI, irq_desc + IRQ_S3C2412_SDI); + generic_handle_irq(IRQ_S3C2412_SDI); if (subsrc & INTBIT(IRQ_S3C2412_CF)) - desc_handle_irq(IRQ_S3C2412_CF, irq_desc + IRQ_S3C2412_CF); + generic_handle_irq(IRQ_S3C2412_CF); } #define INTMSK_CFSDI (1UL << (IRQ_S3C2412_CFSDI - IRQ_EINT0)) diff --combined arch/arm/mach-s3c2412/mach-smdk2413.c index 8f8d9117b96,cd20dbbf9c2..c719b5a740a --- a/arch/arm/mach-s3c2412/mach-smdk2413.c +++ b/arch/arm/mach-s3c2412/mach-smdk2413.c @@@ -19,7 -19,6 +19,7 @@@ #include #include #include +#include #include #include @@@ -28,11 -27,12 +28,11 @@@ #include #include #include -#include #include #include //#include - #include + #include #include #include @@@ -40,13 -40,13 +40,13 @@@ #include #include - #include - #include - #include - #include - #include + #include + #include + #include + #include + #include - #include + #include static struct map_desc smdk2413_iodesc[] __initdata = { }; diff --combined arch/arm/mach-s3c2412/mach-vstms.c index bb9bf63b2e0,70463ccdb5f..4cfa19ad9be --- a/arch/arm/mach-s3c2412/mach-vstms.c +++ b/arch/arm/mach-s3c2412/mach-vstms.c @@@ -17,7 -17,7 +17,7 @@@ #include #include #include - +#include #include #include #include @@@ -29,10 -29,11 +29,10 @@@ #include #include -#include #include #include - #include + #include #include #include @@@ -41,11 -42,11 +41,11 @@@ #include - #include - #include - #include - #include - #include + #include + #include + #include + #include + #include static struct map_desc vstms_iodesc[] __initdata = { diff --combined arch/arm/mach-s3c2412/pm.c index 9540ef752f7,4c988a44d28..217e9e4ed45 --- a/arch/arm/mach-s3c2412/pm.c +++ b/arch/arm/mach-s3c2412/pm.c @@@ -18,9 -18,9 +18,9 @@@ #include #include #include +#include #include -#include #include #include @@@ -28,10 -28,10 +28,10 @@@ #include #include - #include - #include + #include + #include - #include + #include extern void s3c2412_sleep_enter(void); diff --combined arch/arm/mach-s3c2412/s3c2412.c index 42440fc5568,4f18dfc0422..313759c3da6 --- a/arch/arm/mach-s3c2412/s3c2412.c +++ b/arch/arm/mach-s3c2412/s3c2412.c @@@ -20,7 -20,6 +20,7 @@@ #include #include #include +#include #include #include @@@ -28,13 -27,14 +28,13 @@@ #include #include -#include #include #include #include #include - #include + #include #include #include #include @@@ -42,11 -42,11 +42,11 @@@ #include #include - #include - #include - #include - #include - #include + #include + #include + #include + #include + #include #ifndef CONFIG_CPU_S3C2412_ONLY void __iomem *s3c24xx_va_gpio2 = S3C24XX_VA_GPIO; diff --combined arch/arm/mach-s3c2440/clock.c index 40503a65bac,70aba1e9f7d..d1c29b2537c --- a/arch/arm/mach-s3c2440/clock.c +++ b/arch/arm/mach-s3c2440/clock.c @@@ -33,16 -33,16 +33,16 @@@ #include #include #include +#include #include #include #include -#include #include - #include - #include + #include + #include /* S3C2440 extended clock support */ diff --combined arch/arm/mach-s3c2440/dsc.c index 4f7d06baf0d,a0d49a98209..55404427277 --- a/arch/arm/mach-s3c2440/dsc.c +++ b/arch/arm/mach-s3c2440/dsc.c @@@ -15,20 -15,20 +15,20 @@@ #include #include #include +#include #include #include #include #include -#include #include #include #include - #include - #include + #include + #include int s3c2440_set_dsc(unsigned int pin, unsigned int value) { diff --combined arch/arm/mach-s3c2440/irq.c index 33e3ede0a2b,a23cffbfcce..63c5ab65727 --- a/arch/arm/mach-s3c2440/irq.c +++ b/arch/arm/mach-s3c2440/irq.c @@@ -24,19 -24,19 +24,19 @@@ #include #include #include +#include #include #include -#include #include #include #include - #include - #include - #include + #include + #include + #include /* WDT/AC97 */ @@@ -44,6 -44,7 +44,6 @@@ static void s3c_irq_demux_wdtac97(unsig struct irq_desc *desc) { unsigned int subsrc, submsk; - struct irq_desc *mydesc; /* read the current pending interrupts, and the mask * for what it is available */ @@@ -57,10 -58,12 +57,10 @@@ if (subsrc != 0) { if (subsrc & 1) { - mydesc = irq_desc + IRQ_S3C2440_WDT; - desc_handle_irq(IRQ_S3C2440_WDT, mydesc); + generic_handle_irq(IRQ_S3C2440_WDT); } if (subsrc & 2) { - mydesc = irq_desc + IRQ_S3C2440_AC97; - desc_handle_irq(IRQ_S3C2440_AC97, mydesc); + generic_handle_irq(IRQ_S3C2440_AC97); } } } diff --combined arch/arm/mach-s3c2440/mach-anubis.c index 19eb0e5269a,1309fbe5854..e2beca47048 --- a/arch/arm/mach-s3c2440/mach-anubis.c +++ b/arch/arm/mach-s3c2440/mach-anubis.c @@@ -19,7 -19,7 +19,7 @@@ #include #include #include - +#include #include #include @@@ -32,10 -32,11 +32,10 @@@ #include #include -#include #include #include - #include + #include #include #include #include @@@ -48,9 -49,9 +48,9 @@@ #include - #include - #include - #include + #include + #include + #include #define COPYRIGHT ", (c) 2005 Simtec Electronics" diff --combined arch/arm/mach-s3c2440/mach-nexcoder.c index 49e828d1d4d,76b8991dc23..a546307fd53 --- a/arch/arm/mach-s3c2440/mach-nexcoder.c +++ b/arch/arm/mach-s3c2440/mach-nexcoder.c @@@ -21,7 -21,6 +21,7 @@@ #include #include #include +#include #include @@@ -31,18 -30,19 +31,18 @@@ #include #include -#include #include #include //#include #include - #include + #include - #include - #include - #include - #include - #include + #include + #include + #include + #include + #include static struct map_desc nexcoder_iodesc[] __initdata = { /* nothing here yet */ diff --combined arch/arm/mach-s3c2440/mach-osiris.c index 85144aa52c2,6de08f935a8..2361d606abc --- a/arch/arm/mach-s3c2440/mach-osiris.c +++ b/arch/arm/mach-s3c2440/mach-osiris.c @@@ -20,7 -20,6 +20,7 @@@ #include #include #include +#include #include #include @@@ -30,10 -29,11 +30,10 @@@ #include #include -#include #include #include - #include + #include #include #include #include @@@ -44,9 -44,9 +44,9 @@@ #include #include - #include - #include - #include + #include + #include + #include /* onboard perihperal map */ diff --combined arch/arm/mach-s3c2440/mach-rx3715.c index a4c690456d1,1c91c586f64..4d14c7cff89 --- a/arch/arm/mach-s3c2440/mach-rx3715.c +++ b/arch/arm/mach-s3c2440/mach-rx3715.c @@@ -23,7 -23,7 +23,7 @@@ #include #include #include - +#include #include #include #include @@@ -34,10 -34,11 +34,10 @@@ #include #include -#include #include #include - #include + #include #include #include @@@ -45,10 -46,10 +45,10 @@@ #include #include - #include - #include - #include - #include + #include + #include + #include + #include static struct map_desc rx3715_iodesc[] __initdata = { /* dump ISA space somewhere unused */ diff --combined arch/arm/mach-s3c2440/mach-smdk2440.c index 7ac60b869e7,2bd14a3778d..fefeaaa4155 --- a/arch/arm/mach-s3c2440/mach-smdk2440.c +++ b/arch/arm/mach-s3c2440/mach-smdk2440.c @@@ -21,30 -21,30 +21,30 @@@ #include #include #include +#include #include #include #include #include -#include #include #include - #include + #include #include #include #include #include - #include - #include - #include - #include - #include + #include + #include + #include + #include + #include - #include + #include static struct map_desc smdk2440_iodesc[] __initdata = { /* ISA IO Space map (memory space selected by A24) */ diff --combined arch/arm/mach-s3c2440/s3c2440.c index c81cdb33071,52e527eebee..ac1f7ea5f40 --- a/arch/arm/mach-s3c2440/s3c2440.c +++ b/arch/arm/mach-s3c2440/s3c2440.c @@@ -20,18 -20,18 +20,18 @@@ #include #include #include +#include #include #include #include #include -#include #include - #include - #include - #include + #include + #include + #include static struct sys_device s3c2440_sysdev = { .cls = &s3c2440_sysclass, diff --combined arch/arm/mach-s3c2442/clock.c index 18f2ce4d7b2,6bd81790c16..ea1aa1f5157 --- a/arch/arm/mach-s3c2442/clock.c +++ b/arch/arm/mach-s3c2442/clock.c @@@ -33,16 -33,16 +33,16 @@@ #include #include #include +#include #include #include #include -#include #include - #include - #include + #include + #include /* S3C2442 extended clock support */ diff --combined arch/arm/mach-s3c2443/clock.c index 603b5ea1dea,0e849063de7..2f60bf6b8d4 --- a/arch/arm/mach-s3c2443/clock.c +++ b/arch/arm/mach-s3c2443/clock.c @@@ -31,17 -31,17 +31,17 @@@ #include #include #include +#include #include #include -#include #include - #include - #include - #include + #include + #include + #include /* We currently have to assume that the system is running * from the XTPll input, and that all ***REFCLKs are being diff --combined arch/arm/mach-s3c2443/dma.c index 5d9ee772659,438a0196088..f73ccb25ff9 --- a/arch/arm/mach-s3c2443/dma.c +++ b/arch/arm/mach-s3c2443/dma.c @@@ -16,15 -16,15 +16,15 @@@ #include #include #include +#include #include #include -#include - #include - #include + #include + #include - #include + #include #include #include #include diff --combined arch/arm/mach-s3c2443/irq.c index e44341d7dfe,0e00809c1e6..0e0d693f397 --- a/arch/arm/mach-s3c2443/irq.c +++ b/arch/arm/mach-s3c2443/irq.c @@@ -24,19 -24,19 +24,19 @@@ #include #include #include +#include #include #include -#include #include #include #include - #include - #include - #include + #include + #include + #include #define INTMSK(start, end) ((1 << ((end) + 1 - (start))) - 1) @@@ -44,6 -44,7 +44,6 @@@ static inline void s3c2443_irq_demux(un { unsigned int subsrc, submsk; unsigned int end; - struct irq_desc *mydesc; /* read the current pending interrupts, and the mask * for what it is available */ @@@ -56,11 -57,13 +56,11 @@@ subsrc &= (1 << len)-1; end = len + irq; - mydesc = irq_desc + irq; for (; irq < end && subsrc; irq++) { if (subsrc & 1) - desc_handle_irq(irq, mydesc); + generic_handle_irq(irq); - mydesc++; subsrc >>= 1; } } diff --combined arch/arm/mach-s3c2443/mach-smdk2443.c index f0d119dc040,4ea77bfb8b0..a7fe65f3dcc --- a/arch/arm/mach-s3c2443/mach-smdk2443.c +++ b/arch/arm/mach-s3c2443/mach-smdk2443.c @@@ -21,30 -21,30 +21,30 @@@ #include #include #include +#include #include #include #include #include -#include #include #include - #include + #include #include #include #include #include - #include - #include - #include - #include - #include + #include + #include + #include + #include + #include - #include + #include static struct map_desc smdk2443_iodesc[] __initdata = { /* ISA IO Space map (memory space selected by A24) */ diff --combined arch/arm/mach-s3c2443/s3c2443.c index c973b68cc73,f1d1f8e158c..bbeddf9ddcb --- a/arch/arm/mach-s3c2443/s3c2443.c +++ b/arch/arm/mach-s3c2443/s3c2443.c @@@ -20,21 -20,21 +20,21 @@@ #include #include #include +#include #include #include #include #include -#include #include #include #include - #include - #include - #include + #include + #include + #include static struct map_desc s3c2443_iodesc[] __initdata = { IODESC_ENT(WATCHDOG), diff --combined arch/arm/mach-sa1100/generic.c index b9fae2a3985,b422526f6d8..c1fbd5b5f9c --- a/arch/arm/mach-sa1100/generic.c +++ b/arch/arm/mach-sa1100/generic.c @@@ -18,9 -18,9 +18,9 @@@ #include #include /* just for sched_clock() - funny that */ #include + #include #include - #include #include #include #include @@@ -42,7 -42,7 +42,7 @@@ EXPORT_SYMBOL(reset_status) static const unsigned short cclk_frequency_100khz[NR_FREQS] = { 590, /* 59.0 MHz */ 737, /* 73.7 MHz */ - 885, /* 88.5 MHz */ + 885, /* 88.5 MHz */ 1032, /* 103.2 MHz */ 1180, /* 118.0 MHz */ 1327, /* 132.7 MHz */ @@@ -52,10 -52,10 +52,10 @@@ 1917, /* 191.7 MHz */ 2064, /* 206.4 MHz */ 2212, /* 221.2 MHz */ - 2359, /* 235.9 MHz */ - 2507, /* 250.7 MHz */ - 2654, /* 265.4 MHz */ - 2802 /* 280.2 MHz */ + 2359, /* 235.9 MHz */ + 2507, /* 250.7 MHz */ + 2654, /* 265.4 MHz */ + 2802 /* 280.2 MHz */ }; #if defined(CONFIG_CPU_FREQ_SA1100) || defined(CONFIG_CPU_FREQ_SA1110) @@@ -113,7 -113,7 +113,7 @@@ unsigned int sa11x0_getspeed(unsigned i #else /* * We still need to provide this so building without cpufreq works. - */ + */ unsigned int cpufreq_get(unsigned int cpu) { return cclk_frequency_100khz[PPCR & 0xf] * 100; @@@ -389,7 -389,7 +389,7 @@@ EXPORT_SYMBOL(sa1100fb_lcd_power) */ static struct map_desc standard_io_desc[] __initdata = { - { /* PCM */ + { /* PCM */ .virtual = 0xf8000000, .pfn = __phys_to_pfn(0x80000000), .length = 0x00100000, diff --combined arch/arm/mach-versatile/core.c index 824121d52b8,b638f10411e..1553d986dcb --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c @@@ -28,11 -28,11 +28,11 @@@ #include #include #include +#include + #include - #include #include #include -#include #include #include #include @@@ -95,7 -95,8 +95,7 @@@ sic_handle_irq(unsigned int irq, struc irq += IRQ_SIC_START; - desc = irq_desc + irq; - desc_handle_irq(irq, desc); + generic_handle_irq(irq); } while (status); } diff --combined arch/arm/plat-omap/devices.c index 25232b281e1,01da719a745..ed94dee326c --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@@ -13,24 -13,24 +13,24 @@@ #include #include #include +#include #include -#include #include #include #include +#include #include #include #include #include #include #include +#include #if defined(CONFIG_OMAP_DSP) || defined(CONFIG_OMAP_DSP_MODULE) -#include "../plat-omap/dsp/dsp_common.h" - static struct dsp_platform_data dsp_pdata = { .kdev_list = LIST_HEAD_INIT(dsp_pdata.kdev_list), }; @@@ -76,7 -76,7 +76,7 @@@ int dsp_kfunc_device_register(struct ds { static DEFINE_MUTEX(dsp_pdata_lock); - mutex_init(&kdev->lock); + spin_lock_init(&kdev->lock); mutex_lock(&dsp_pdata_lock); list_add_tail(&kdev->entry, &dsp_pdata.kdev_list); @@@ -95,10 -95,6 +95,10 @@@ static inline void omap_init_dsp(void) static void omap_init_kp(void) { + /* 2430 and 34xx keypad is on TWL4030 */ + if (cpu_is_omap2430() || cpu_is_omap34xx()) + return; + if (machine_is_omap_h2() || machine_is_omap_h3()) { omap_cfg_reg(F18_1610_KBC0); omap_cfg_reg(D20_1610_KBC1); @@@ -160,6 -156,13 +160,6 @@@ void omap_mcbsp_register_board_cfg(stru { int i; - if (size > OMAP_MAX_MCBSP_COUNT) { - printk(KERN_WARNING "Registered too many McBSPs platform_data." - " Using maximum (%d) available.\n", - OMAP_MAX_MCBSP_COUNT); - size = OMAP_MAX_MCBSP_COUNT; - } - omap_mcbsp_devices = kzalloc(size * sizeof(struct platform_device *), GFP_KERNEL); if (!omap_mcbsp_devices) { @@@ -313,19 -316,6 +313,6 @@@ static inline void omap_init_mmc_conf(c omap_cfg_reg(MMC_DAT3); } } - #if defined(CONFIG_ARCH_OMAP2420) - if (mmc_conf->mmc[0].internal_clock) { - /* - * Use internal loop-back in MMC/SDIO - * Module Input Clock selection - */ - if (cpu_is_omap24xx()) { - u32 v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0); - v |= (1 << 24); /* not used in 243x */ - omap_ctrl_writel(v, OMAP2_CONTROL_DEVCONF0); - } - } - #endif } #ifdef CONFIG_ARCH_OMAP16XX @@@ -535,6 -525,10 +522,6 @@@ static inline void omap_init_rng(void) */ static int __init omap_init_devices(void) { -/* - * Need to enable relevant once for 2430 SDP - */ -#ifndef CONFIG_MACH_OMAP_2430SDP /* please keep these calls, and their implementations above, * in alphabetical order so they're easier to sort through. */ @@@ -544,6 -538,7 +531,6 @@@ omap_init_uwire(); omap_init_wdt(); omap_init_rng(); -#endif return 0; } arch_initcall(omap_init_devices); diff --combined arch/arm/plat-s3c24xx/clock.c index 400541359bf,f333b64512b..a005ddbd9ef --- a/arch/arm/plat-s3c24xx/clock.c +++ b/arch/arm/plat-s3c24xx/clock.c @@@ -39,16 -39,16 +39,16 @@@ #include #include #include +#include #include #include -#include #include #include - #include - #include + #include + #include /* clock information */ diff --combined arch/arm/plat-s3c24xx/common-smdk.c index d528f460f6b,ebdf6cd832a..3098736c65d --- a/arch/arm/plat-s3c24xx/common-smdk.c +++ b/arch/arm/plat-s3c24xx/common-smdk.c @@@ -25,7 -25,6 +25,7 @@@ #include #include #include +#include #include #include @@@ -33,6 -32,7 +33,6 @@@ #include #include -#include #include #include @@@ -40,9 -40,9 +40,9 @@@ #include - #include - #include - #include + #include + #include + #include /* LED devices */ diff --combined arch/arm/plat-s3c24xx/cpu.c index 9c607bbc934,51aea671075..22a329513c0 --- a/arch/arm/plat-s3c24xx/cpu.c +++ b/arch/arm/plat-s3c24xx/cpu.c @@@ -29,11 -29,11 +29,11 @@@ #include #include #include +#include +#include #include #include -#include -#include #include #include @@@ -42,18 -42,18 +42,18 @@@ #include #include - #include + #include - #include - #include - #include - #include - #include - #include + #include + #include + #include + #include + #include + #include #include "s3c244x.h" - #include - #include - #include + #include + #include + #include struct cpu_table { unsigned long idcode; diff --combined arch/arm/plat-s3c24xx/devs.c index 6b13b5455df,8cf4b1b32b0..e93f8bf6d33 --- a/arch/arm/plat-s3c24xx/devs.c +++ b/arch/arm/plat-s3c24xx/devs.c @@@ -19,20 -19,20 +19,20 @@@ #include #include #include +#include #include #include #include #include #include -#include #include - #include + #include #include - #include - #include + #include + #include #include /* Serial port registrations */ diff --combined arch/arm/plat-s3c24xx/dma.c index d6344461a83,390ff9f478b..1baf941d193 --- a/arch/arm/plat-s3c24xx/dma.c +++ b/arch/arm/plat-s3c24xx/dma.c @@@ -26,17 -26,17 +26,17 @@@ #include #include #include +#include #include #include #include -#include #include #include #include - #include + #include /* io map for dma */ static void __iomem *dma_base; diff --combined arch/arm/plat-s3c24xx/irq.c index 590fc5a3ab0,25d532490b4..963f7a4f26f --- a/arch/arm/plat-s3c24xx/irq.c +++ b/arch/arm/plat-s3c24xx/irq.c @@@ -55,19 -55,19 +55,19 @@@ #include #include #include +#include #include #include -#include #include #include #include - #include - #include - #include + #include + #include + #include /* wakeup irq control */ @@@ -468,6 -468,7 +468,6 @@@ static void s3c_irq_demux_adc(unsigned { unsigned int subsrc, submsk; unsigned int offset = 9; - struct irq_desc *mydesc; /* read the current pending interrupts, and the mask * for what it is available */ @@@ -481,10 -482,12 +481,10 @@@ if (subsrc != 0) { if (subsrc & 1) { - mydesc = irq_desc + IRQ_TC; - desc_handle_irq(IRQ_TC, mydesc); + generic_handle_irq(IRQ_TC); } if (subsrc & 2) { - mydesc = irq_desc + IRQ_ADC; - desc_handle_irq(IRQ_ADC, mydesc); + generic_handle_irq(IRQ_ADC); } } } @@@ -493,6 -496,7 +493,6 @@@ static void s3c_irq_demux_uart(unsigne { unsigned int subsrc, submsk; unsigned int offset = start - IRQ_S3CUART_RX0; - struct irq_desc *desc; /* read the current pending interrupts, and the mask * for what it is available */ @@@ -508,14 -512,20 +508,14 @@@ subsrc &= 7; if (subsrc != 0) { - desc = irq_desc + start; - if (subsrc & 1) - desc_handle_irq(start, desc); - - desc++; + generic_handle_irq(start); if (subsrc & 2) - desc_handle_irq(start+1, desc); - - desc++; + generic_handle_irq(start+1); if (subsrc & 4) - desc_handle_irq(start+2, desc); + generic_handle_irq(start+2); } } @@@ -562,7 -572,7 +562,7 @@@ s3c_irq_demux_extint8(unsigned int irq eintpnd &= ~(1< #include #include +#include #include #include #include -#include #include #include @@@ -33,7 -33,7 +33,7 @@@ #include - #include + #include #define COPYRIGHT ", (c) 2005 Simtec Electronics" diff --combined arch/arm/plat-s3c24xx/pm.c index d3934b1119a,d937ff1a9ac..8efb57ad501 --- a/arch/arm/plat-s3c24xx/pm.c +++ b/arch/arm/plat-s3c24xx/pm.c @@@ -35,12 -35,12 +35,12 @@@ #include #include #include +#include #include #include -#include - #include + #include #include #include #include @@@ -48,7 -48,7 +48,7 @@@ #include - #include + #include /* for external use */ diff --combined arch/arm/plat-s3c24xx/s3c244x-clock.c index 119647a5eaa,b998ee62447..7c09773ff9f --- a/arch/arm/plat-s3c24xx/s3c244x-clock.c +++ b/arch/arm/plat-s3c24xx/s3c244x-clock.c @@@ -33,16 -33,16 +33,16 @@@ #include #include #include +#include #include #include #include -#include #include - #include - #include + #include + #include static int s3c2440_setparent_armclk(struct clk *clk, struct clk *parent) { diff --combined arch/arm/plat-s3c24xx/s3c244x-irq.c index 0601c5f3230,3520a093ef8..0902afd227c --- a/arch/arm/plat-s3c24xx/s3c244x-irq.c +++ b/arch/arm/plat-s3c24xx/s3c244x-irq.c @@@ -24,19 -24,19 +24,19 @@@ #include #include #include +#include #include #include -#include #include #include #include - #include - #include - #include + #include + #include + #include /* camera irq */ @@@ -44,6 -44,7 +44,6 @@@ static void s3c_irq_demux_cam(unsigned struct irq_desc *desc) { unsigned int subsrc, submsk; - struct irq_desc *mydesc; /* read the current pending interrupts, and the mask * for what it is available */ @@@ -57,10 -58,12 +57,10 @@@ if (subsrc != 0) { if (subsrc & 1) { - mydesc = irq_desc + IRQ_S3C2440_CAM_C; - desc_handle_irq(IRQ_S3C2440_CAM_C, mydesc); + generic_handle_irq(IRQ_S3C2440_CAM_C); } if (subsrc & 2) { - mydesc = irq_desc + IRQ_S3C2440_CAM_P; - desc_handle_irq(IRQ_S3C2440_CAM_P, mydesc); + generic_handle_irq(IRQ_S3C2440_CAM_P); } } } diff --combined arch/arm/plat-s3c24xx/s3c244x.c index 146863a69ae,e94721fad41..c0344fac4a9 --- a/arch/arm/plat-s3c24xx/s3c244x.c +++ b/arch/arm/plat-s3c24xx/s3c244x.c @@@ -20,28 -20,28 +20,28 @@@ #include #include #include +#include #include #include #include #include -#include #include #include - #include + #include #include #include #include - #include - #include + #include + #include #include "s3c244x.h" - #include - #include - #include - #include + #include + #include + #include + #include static struct map_desc s3c244x_iodesc[] __initdata = { IODESC_ENT(CLKPWR), diff --combined arch/arm/plat-s3c24xx/time.c index 64bfa19ae95,0bba4bf25a9..c51916236ac --- a/arch/arm/plat-s3c24xx/time.c +++ b/arch/arm/plat-s3c24xx/time.c @@@ -25,20 -25,20 +25,20 @@@ #include #include #include +#include #include #include #include -#include #include #include - #include + #include #include #include - #include - #include + #include + #include static unsigned long timer_startval; static unsigned long timer_usec_ticks; diff --combined drivers/mfd/Kconfig index 5dba1651f9c,68dc8d9eb24..0dae245c625 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@@ -21,7 -21,7 +21,7 @@@ config MFD_SM50 config MFD_SM501_GPIO bool "Export GPIO via GPIO layer" - depends on MFD_SM501 && HAVE_GPIO_LIB + depends on MFD_SM501 && GPIOLIB ---help--- This option uses the gpio library layer to export the 64 GPIO lines on the SM501. The platform data is used to supply the @@@ -29,7 -29,7 +29,7 @@@ config MFD_ASIC3 bool "Support for Compaq ASIC3" - depends on GENERIC_HARDIRQS && HAVE_GPIO_LIB && ARM + depends on GENERIC_HARDIRQS && GPIOLIB && ARM ---help--- This driver supports the ASIC3 multifunction chip found on many PDAs (mainly iPAQ and HTC based ones) @@@ -50,15 -50,6 +50,15 @@@ config HTC_PASIC HTC Magician devices, respectively. Actual functionality is handled by the leds-pasic3 and ds1wm drivers. +config UCB1400_CORE + tristate "Philips UCB1400 Core driver" + help + This enables support for the Philips UCB1400 core functions. + The UCB1400 is an AC97 audio codec. + + To compile this driver as a module, choose M here: the + module will be called ucb1400_core. + config MFD_TMIO bool default n