summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'next/board-samsung' of ↵Olof Johansson2012-03-1314-11/+346
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/boards * 'next/board-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (32 commits) ARM: EXYNOS: support Exynos4210-bus Devfreq driver on Nuri board ARM: EXYNOS: Register JPEG on nuri ARM: EXYNOS: Register JPEG on universal_c210 ARM: S5PV210: Enable JPEG on SMDKV210 ARM: S5PV210: Add JPEG board definition ARM: EXYNOS: Enable JPEG on Origen ARM: EXYNOS: Enable JPEG on SMDKV310 ARM: EXYNOS: Add __init attribute to universal_camera_init() ARM: EXYNOS: Add __init attribute to nuri_camera_init() ARM: S5PV210: Enable FIMC on SMDKC110 ARM: S5PV210: Enable FIMC on SMDKV210 ARM: S5PV210: Enable MFC on SMDKC110 ARM: S5PV210: Enable MFC on SMDKV210 ARM: EXYNOS: Enable G2D on SMDKV310 ARM: S3C64XX: Supply platform data for SPI on Cragganmore ARM: S3C64XX: Add some more Cragganmore module IDs to the table ARM: EXYNOS: Add missing FIMC media device to Origen ARM: EXYNOS: Add missing FIMC media device to SMDKV310 ARM: S5PV210: Add missing FIMC media device to Aquila ARM: SAMSUNG: Add support for S5K6AAFX camera on Nuri board ...
| * ARM: EXYNOS: support Exynos4210-bus Devfreq driver on Nuri boardMyungJoo Ham2012-03-101-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Support varying voltages: - GPIODVS for Buck2 is removed. - Voltage ragne for Buck2 is widen. Support Buck2 regulator for Exynos4210-bus devfreq driver: - Added device name for buck2 regulator - Added exynos4210-busfreq platform device fro Nuri board. Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: EXYNOS: Register JPEG on nuriAndrzej Pietrasiewicz2012-03-102-0/+2
| | | | | | | | | | | | Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: EXYNOS: Register JPEG on universal_c210Andrzej Pietrasiewicz2012-03-102-0/+2
| | | | | | | | | | | | Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S5PV210: Enable JPEG on SMDKV210Sachin Kamat2012-03-102-0/+2
| | | | | | | | | | | | | | Enables JPEG support on SMDKV210 board. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S5PV210: Add JPEG board definitionSachin Kamat2012-03-102-0/+9
| | | | | | | | | | | | | | Adds JPEG board definition to S5PV210 machine Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: EXYNOS: Enable JPEG on OrigenSachin Kamat2012-03-102-0/+2
| | | | | | | | | | | | | | Enables JPEG support on Origen board. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: EXYNOS: Enable JPEG on SMDKV310Sachin Kamat2012-03-102-0/+2
| | | | | | | | | | | | | | Enables JPEG support on SMDKV310 board. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: EXYNOS: Add __init attribute to universal_camera_init()Tushar Behera2012-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | s3c_set_platdata() is defined with __init attribute, hence all functions referencing this function should also be defined with __init attribute. universal_camera_init() is referenced only in '__init universal_machine_init()', thus this change won't put any additional constraint on the usage of universal_camera_init(). Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: EXYNOS: Add __init attribute to nuri_camera_init()Tushar Behera2012-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | s3c_set_platdata() is defined with __init attribute, hence all functions referencing this function should also be defined with __init attribute. nuri_camera_init() is referenced only in '__init nuri_machine_init()', thus this change won't put any additional constraint on the usage of nuri_camera_init(). Signed-off-by: Tushar Behera <tushar.behera@linaro.org> Acked-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S5PV210: Enable FIMC on SMDKC110Sachin Kamat2012-03-102-0/+7
| | | | | | | | | | | | | | Enable FIMC 0,1,2 and media device (md) on SMDKC110 board. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S5PV210: Enable FIMC on SMDKV210Sachin Kamat2012-03-102-0/+7
| | | | | | | | | | | | | | Enable FIMC 0,1,2 and media device(md) on SMDKV210 board. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S5PV210: Enable MFC on SMDKC110Sachin Kamat2012-03-102-0/+11
| | | | | | | | | | | | | | Add MFC support on SMDKC110 board. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S5PV210: Enable MFC on SMDKV210Sachin Kamat2012-03-102-0/+11
| | | | | | | | | | | | | | Add MFC support on SMDKV210 board. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: EXYNOS: Enable G2D on SMDKV310Sachin Kamat2012-03-102-0/+2
| | | | | | | | | | | | | | This patch enables G2D support on SMDKV310 board. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S3C64XX: Supply platform data for SPI on CragganmoreMark Brown2012-03-071-1/+1
| | | | | | | | | | | | | | | | Having to specify the platform data explicitly like this even though it is provided as a default doesn't feel entirely elegant but there we are. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S3C64XX: Add some more Cragganmore module IDs to the tableMark Brown2012-03-071-0/+4
| | | | | | | | | | | | | | | | | | Just IDs for diagnostics, nothing is actually supported. Not all of these have board numbers assigned yet, these will be updated as the numbers are assigned. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: EXYNOS: Add missing FIMC media device to OrigenSachin Kamat2012-01-311-0/+1
| | | | | | | | | | | | | | FIMC media device (md) registers all required video nodes. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: EXYNOS: Add missing FIMC media device to SMDKV310Sachin Kamat2012-01-311-0/+1
| | | | | | | | | | | | | | FIMC media device (md) registers all required video nodes. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S5PV210: Add missing FIMC media device to AquilaSachin Kamat2012-01-311-0/+1
| | | | | | | | | | | | | | FIMC media device (md) registers all required video nodes. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: SAMSUNG: Add support for S5K6AAFX camera on Nuri boardSylwester Nawrocki2012-01-312-0/+67
| | | | | | | | | | | | | | | | | | | | Add voltage regulator and platform data definitions for S5K6AAFX sensor driver and configure I2C6 bus timings. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: HeungJun Kim <riverful.kim@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: EXYNOS: Add support for S5K6AAFX image sensor on Universal C210 boardSylwester Nawrocki2012-01-311-4/+70
| | | | | | | | | | | | | | | | | | Add voltage regulator and platform data definitions for S5K6AAFX image sensor driver. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: EXYNOS: Increase virtual framebuffer size on Universal C210 boardSylwester Nawrocki2012-01-311-0/+2
| | | | | | | | | | | | | | | | Increase framebuffer virtual size to enable display panning. Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S3C64XX: Add a SPKVDD supply for CODECs on CragganmoreMark Brown2012-01-271-0/+1
| | | | | | | | | | | | | | Hook up a SPKVDD supply for CODECs that can use it. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S3C64XX: Add hookup for Tomatin module on CragganmoreMark Brown2012-01-202-2/+36
| | | | | | | | | | | | | | | | | | The Tomatin module carries a WM0010 audio DSP. Provide basic hookup for this, though additional platform data will be needed to fully integrate with the driver. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S3C64XX: Enable power management for WiFi on CragganmoreMark Brown2012-01-201-0/+1
| | | | | | | | | | | | | | | | Allow the SDHCI stack to runtime power manage the WiFi card on Cragganmore for better power optimisation. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S3C64XX: Enable power management for disk on CragganmoreMark Brown2012-01-201-0/+2
| | | | | | | | | | | | | | | | We can happily let the MMC stack do power management for the MMC card that is our main disk on Cragganmore so let's enable it. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S3C64XX: Fix build of Cragganmore after SPI changesMark Brown2012-01-201-0/+1
| | | | | | | | | | | | | | | | | | | | Commit 875a59 (ARM: SAMSUNG: Consolidation of SPI platform devices to plat-samsung) replaced the function s3c64xx_spi_set_info() with s3c64xx_spiN_set_platdata() but did not update all the machines, with Cragganmore being left. Fix that. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: S3C64XX: Support GPIO LEDs on CragganmoreMark Brown2012-01-202-0/+52
| | | | | | | | | | | | | | | | | | Cragganmore has a bank of 8 LEDs connected to the memory mapped GPIO bank, mostly intended for low level diagnostics. Register these with the LED subsystem for runtime use. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: EXYNOS: Enable G2D on ORIGENSachin Kamat2012-01-202-0/+2
| | | | | | | | | | | | | | This patch enables G2D support on ORIGEN board. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: EXYNOS: Enable Bluetooth on ORIGENSangwook Lee2012-01-201-0/+34
| | | | | | | | | | | | | | This patch enables Bluetooth support on ORIGEN board. Signed-off-by: Sangwook Lee <sangwook.lee@linaro.org> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: EXYNOS: add G2D to mach-universalKamil Debski2012-01-202-0/+2
| | | | | | | | | | | | Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
| * ARM: EXYNOS: add G2D to mach-nuriKamil Debski2012-01-202-0/+2
| | | | | | | | | | | | Signed-off-by: Kamil Debski <k.debski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
* | Merge branch 'board' of ↵Olof Johansson2012-03-10205-747/+1503
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards * 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP: add minimal support for Nokia RM-696 ARM: OMAP: enable Bluetooth on the PandaBoard ARM: OMAP: pandora: add support for backlight and poweroff ARM: OMAP4: board-4430sdp: don't initialize value that is never used ARM: OMAP3: cm-t3517: add EMAC support ARM: OMAP: move generic EMAC init to separate file ARM: OMAP3: RX-51: add explicit mux configuration of tsc2005 control gpios ARM: OMAP: Add omap_reserve functionality (includes sync-up to 3.3-rc6)
| * | ARM: OMAP: add minimal support for Nokia RM-696Aaro Koskinen2012-03-053-2/+16
| | | | | | | | | | | | | | | | | | | | | Add minimal support for Nokia RM-696 board. Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP: enable Bluetooth on the PandaBoardMircea Gherzan2012-03-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | The PandaBoard features a Texas Instruments WiLink7 Bluetooth chip, supported by the "btwilink" driver. Signed-off-by: Mircea Gherzan <mgherzan@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP: pandora: add support for backlight and poweroffGrazvydas Ignotas2012-03-051-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | Add platform data for drivers that recently appeared in kernel: backlight and TWL4030 poweroff support. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP4: board-4430sdp: don't initialize value that is never usedUwe Kleine-König2012-03-051-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sdp4430_spi_board_info.irq was initialized to ETH_KS8851_IRQ and in omap_4430sdp_init() overwritten with gpio_to_irq(ETH_KS8851_IRQ) before sdp4430_spi_board_info was registered. This is a bit confusing, so better don't initialize .irq and document that it is set later. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP3: cm-t3517: add EMAC supportIgor Grinberg2012-03-051-0/+2
| | | | | | | | | | | | | | | | | | | | | Add support for the EMAC Ethernet controller in the AM35xx SoC. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP: move generic EMAC init to separate fileIlya Yanok2012-03-054-115/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AM35xx SoCs include DaVinci EMAC IP. Initialization code in board-am3517evm.c is pretty board independent and will work for any AM35xx based board so move this code to it's own file to be reused by other boards. Signed-off-by: Ilya Yanok <yanok@emcraft.com> Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP3: RX-51: add explicit mux configuration of tsc2005 control gpiosVladimir Zapolskiy2012-03-051-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change converts TSC2005 related GPIO requests to be done with gpio_request_array() method and explicitly inits mux configuration for these GPIOs. Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> Cc: Tony Lindgren <tony@atomide.com> Cc: Aaro Koskinen <aaro.koskinen@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | ARM: OMAP: Add omap_reserve functionalityAlex2012-03-051-0/+2
| | | | | | | | | | | | | | | | | | | | | This patch adds omap_reserve functionality to board-omap3logic.c Signed-off-by: Alex Gershgorin <alexg@meprolight.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
| * | Linux 3.3-rc6v3.3-rc6Linus Torvalds2012-03-031-1/+1
| | |
| * | Merge tag 'scsi-fixes' of ↵Linus Torvalds2012-03-031-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 SCSI fixes from James Bottomley: "There's just a single fix in here: the osd max device number fix." * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576
| | * | [SCSI] osd_uld: Bump MAX_OSD_DEVICES from 64 to 1,048,576Boaz Harrosh2012-02-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It used to be that minors where 8 bit. But now they are actually 20 bit. So the fix is simplicity itself. I've tested with 300 devices and all user-mode utils work just fine. I have also mechanically added 10,000 to the ida (so devices are /dev/osd10000, /dev/osd10001 ...) and was able to mkfs an exofs filesystem and access osds from user-mode. All the open-osd user-mode code uses the same library to access devices through their symbolic names in /dev/osdX so I'd say it's pretty safe. (Well tested) This patch is very important because some of the systems that will be deploying the 3.2 pnfs-objects code are larger than 64 OSDs and will stop to work properly when reaching that number. CC: Stable <stable@vger.kernel.org> Signed-off-by: Boaz Harrosh <bharrosh@panasas.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
| * | | Merge tag 'parisc-fixes' of ↵Linus Torvalds2012-03-034-2/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6 PARISC fixes from James Bottomley: "This is a set of build fixes to get the cross compiled architecture testbeds building again" * tag 'parisc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6: [PARISC] don't unconditionally override CROSS_COMPILE for 64 bit. [PARISC] include <linux/prefetch.h> in drivers/parisc/iommu-helpers.h [PARISC] fix compile break caused by iomap: make IOPORT/PCI mapping functions conditional
| | * | | [PARISC] don't unconditionally override CROSS_COMPILE for 64 bit.James Bottomley2012-02-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user may wish to set their own value (for real cross compiles). Since the top level Makefile initialises CROSS_COMPILE to empty by default, we must check it for being empty (rather than for being defined) before we override. Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
| | * | | [PARISC] include <linux/prefetch.h> in drivers/parisc/iommu-helpers.hCong Wang2012-02-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | drivers/parisc/iommu-helpers.h:62: error: implicit declaration of function 'prefetchw' make[3]: *** [drivers/parisc/sba_iommu.o] Error 1 drivers/parisc/iommu-helpers.h needs to #include <linux/prefetch.h> where prefetchw is declared. Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
| | * | | [PARISC] fix compile break caused by iomap: make IOPORT/PCI mapping ↵James Bottomley2012-02-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functions conditional The problem in commit fea80311a939a746533a6d7e7c3183729d6a3faf Author: Randy Dunlap <rdunlap@xenotime.net> Date: Sun Jul 24 11:39:14 2011 -0700 iomap: make IOPORT/PCI mapping functions conditional is that if your architecture supplies pci_iomap/pci_iounmap, it expects always to supply them. Adding empty body defitions in the !CONFIG_PCI case, which is what this patch does, breaks the parisc compile because the functions become doubly defined. It took us a while to spot this, because we don't actually build !CONFIG_PCI very often (only if someone is brave enough to test the snake/asp machines). Since the note in the commit log says this is to fix a CONFIG_GENERIC_IOMAP issue (which it does because CONFIG_GENERIC_IOMAP supplies pci_iounmap only if CONFIG_PCI is set), there should actually have been a condition upon this. This should make sure no other architecture's !CONFIG_PCI compile breaks in the same way as parisc. The fix had to be updated to take account of the GENERIC_PCI_IOMAP separation. Reported-by: Rolf Eike Beer <eike@sf-mail.de> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
| * | | | Merge branch 'perf-urgent-for-linus' of ↵Linus Torvalds2012-03-034-4/+54
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf/x86/kvm: Fix Host-Only/Guest-Only counting with SVM disabled
OpenPOWER on IntegriCloud