summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/include/plat
Commit message (Collapse)AuthorAgeFilesLines
* ARM: SAMSUNG: gpio-cfg.h: update documentationBen Dooks2010-05-281-0/+21
| | | | | | | | Update the documentation on the gpio configuration calls to add more references to useful information and also to document the values that are passed. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: SAMSUNG: Fix documentation for s3c_gpio_cfgpin()Ben Dooks2010-05-281-1/+1
| | | | | | | Fix typo in s3c_gpio_cfgpin() documentation, the second argument is @to not @pin again. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2010-05-259-0/+239
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (103 commits) ARM: 6141/1: Add audio support part in arch/arm/mach-w90x900 ARM: 5939/1: ARM: Add option CMDLINE_FORCE to force usage of the in-kernel cmdline ARM: 6140/1: silence a bogus sparse warning in unwind.c ARM: mach-at91: duplicated include ARM: arch/arm/nwfpe/fpsr.h: Checkpatch cleanup ARM: arch/arm/mach-shark/pci.c: Checkpatch cleanup ARM: arch/arm/nwfpe/ChangeLog: Checkpatch cleanup ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanup ARM: arch/arm/mach-h720x/common.h: Checkpatch cleanup ARM: arch/arm/mach-footbridge/ebsa285-pci.c: Checkpatch cleanup ARM: arch/arm/mach-clps711x/Makefile.boot: Checkpatch cleanup ARM: arch/arm/boot/bootp/bootp.lds: Checkpatch cleanup ARM: SPEAR6xx: remove duplicated #include ARM: s3c6400_defconfig: Add NAND driver ARM: s3c6400_defconfig: enable sound as modules ARM: s3c6400_defconfig: enable power management ARM: s5pv210_defconfig: Update s5pv210_defconfig to v2.6.34 ARM: s5pc110_defconfig: Update s5pc110_defconfig to v2.6.34 ARM: s5p6442_defconfig: Update s5p6442_defconfig to v2.6.34 ARM: s5p6440_defconfig: Update s5p6440_defconfig to v2.6.34 ...
| * ARM: SAMSUNG: Add support for interrupt wakeup-sourcesBen Dooks2010-05-201-0/+44
| | | | | | | | | | | | | | | | | | Add support for wakeup-mask style interrupts that share a single mask register for various different interrupts. This registers a set of interrupt->bit mappings and the register they belong to. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * ARM: Merge for-2635-4/onenandBen Dooks2010-05-203-0/+103
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'for-2635-4/onenand' into for-2635-4/partial2 Conflicts: arch/arm/mach-s5pc100/cpu.c arch/arm/mach-s5pc100/include/mach/map.h arch/arm/mach-s5pv210/Makefile
| | * ARM: SAMSUNG: Add platform support code for OneNAND controllerMarek Szyprowski2010-05-203-0/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds setup code for Samsung OneNAND controller driver. The driver needs to be aware on which SoC it is running, so the actual device id is being changed in cpu init code. S3C64xx SoCs have 2 OneNAND controllers while S5PC100 and S5PC110 has only one. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> [ben-linux@fluff.org: sort map.h entries] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: Merge for-2635-4/spi-devsBen Dooks2010-05-202-0/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'for-2635-4/spi-devs' into for-2635-4/partial2 Conflicts: arch/arm/mach-s5pc100/include/mach/map.h arch/arm/mach-s5pv210/Makefile
| | * | ARM: S5P6440: Define SPI platform devicesJassi Brar2010-05-202-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Define SPI platform devices for the SoC. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | ARM: S5P6442: Define SPI platform devicesJassi Brar2010-05-202-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Define SPI platform devices for the SoC. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | ARM: S5PV210: Define SPI platform devicesJassi Brar2010-05-202-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Define SPI platform devices for the SoC. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| | * | ARM: S5PC100: Define SPI platform devicesJassi Brar2010-05-202-0/+5
| | |/ | | | | | | | | | | | | | | | | | | Define SPI platform devices for the SoC. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: Merge for-2635-4/s5p-devsBen Dooks2010-05-201-0/+7
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'for-2635-4/s5p-devs' into for-2635-4/partial2 Conflicts: arch/arm/mach-s5pc100/include/mach/map.h
| | * | ARM: S5PC100: Add audio platform devicesJassi Brar2010-05-201-0/+7
| | |/ | | | | | | | | | | | | | | | | | | Define platform devices for all audio devices found on S5PC100 Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: S5PV210: add common HSMMC device helpersMarek Szyprowski2010-05-201-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds sdhci platform helpers required by sdhci-s3c driver. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: S5PV210: add common I2C device helpersMarek Szyprowski2010-05-203-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds I2C platform helpers required by s3c2440-i2c driver. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: S5PV210: add framebuffer platform helpers for s5pv210 based machinesMarek Szyprowski2010-05-201-0/+7
| |/ | | | | | | | | | | | | | | | | This patch adds common framebuffer device helpers and register defines for S5PV210 based machines. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | s3c rtc driver: add support for S3C64xxMaurus Cuelenaere2010-05-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Add support for the S3C64xx SoC to the generic S3C RTC driver. Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Acked-by: Ben Dooks <ben-linux@fluff.org> Cc: Frans Pop <elendil@planet.nl> Cc: Paul Gortmaker <p_gortmaker@yahoo.com> Cc: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* | Merge branch 'for-linus' of ↵Linus Torvalds2010-05-201-82/+0
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (250 commits) ALSA: hda: Storage class should be before const qualifier ASoC: tpa6130a2: Remove CPVSS and HPVdd supplies ASoC: tpa6130a2: Define output pins with SND_SOC_DAPM_OUTPUT ASoC: sdp4430 - add sdp4430 pcm ops to DAI. ASoC: TWL6040: Enable earphone path in codec ASoC: SDP4430: Add support for Earphone speaker ASoC: SDP4430: Add sdp4430 machine driver ASoC: tlv320dac33: Avoid powering off while in BIAS_OFF ASoC: tlv320dac33: Use dev_dbg in dac33_hard_power function ALSA: sound/pci/asihpi: Use kzalloc ALSA: hdmi - dont fail on extra nodes ALSA: intelhdmi - add id for the CougarPoint chipset ALSA: intelhdmi - user friendly codec name ALSA: intelhdmi - add dependency on SND_DYNAMIC_MINORS ALSA: asihpi: incorrect range check ALSA: asihpi: testing the wrong variable ALSA: es1688: add pedantic range checks ARM: McBSP: Add support for omap4 in McBSP driver ARM: McBSP: Fix request for irq in OMAP4 OMAP: McBSP: Add 32-bit mode support ...
| * | ASoC: S3C: I2Sv2: Move defines closer to driverJassi Brar2010-05-051-82/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The header for I2Sv2 linux/arch/arm/plat-s3c/include/plat/regs-s3c2412-iis.h contains only controller specific definitions and nothing SoC specific. So, it could be moved to sound/soc/s3c24xx/ Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Acked-by: Ben Dooks <ben-linux@fluff.org> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
* | | Merge branch 'for-linus' of ↵Linus Torvalds2010-05-201-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits) vlynq: make whole Kconfig-menu dependant on architecture add descriptive comment for TIF_MEMDIE task flag declaration. EEPROM: max6875: Header file cleanup EEPROM: 93cx6: Header file cleanup EEPROM: Header file cleanup agp: use NULL instead of 0 when pointer is needed rtc-v3020: make bitfield unsigned PCI: make bitfield unsigned jbd2: use NULL instead of 0 when pointer is needed cciss: fix shadows sparse warning doc: inode uses a mutex instead of a semaphore. uml: i386: Avoid redefinition of NR_syscalls fix "seperate" typos in comments cocbalt_lcdfb: correct sections doc: Change urls for sparse Powerpc: wii: Fix typo in comment i2o: cleanup some exit paths Documentation/: it's -> its where appropriate UML: Fix compiler warning due to missing task_struct declaration UML: add kernel.h include to signal.c ...
| * | fix "seperate" typos in commentsAnand Gadiyar2010-05-101-1/+1
| |/ | | | | | | | | | | | | s/seperate/separate Signed-off-by: Anand Gadiyar <gadiyar@ti.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
* | ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreenNaveen Krishna2010-05-191-0/+4
| | | | | | | | | | | | | | | | | | This patch implements cfg_gpio function for Samsung touchscreen. And also modifies the H1940 machine respectively. Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: SAMSUNG: Move mach/ts.h to plat/ts.hMaurus Cuelenaere2010-05-191-0/+21
| | | | | | | | | | | | | | | | This moves mach-s3c2410/include/mach/ts.h to plat-samsung/include/plat/ts.h in order to prepare for s3c64xx support in the touchscreen driver. Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: SAMSUNG: move driver strength gpio configuration helper to common dirMarek Szyprowski2010-05-191-0/+30
| | | | | | | | | | | | | | | | | | | | Driver strength parameter can be changed not only on S5PC100 but also on S5PV210/S5PC110 platforms, so move the helper functions to the common plat-samsung directory. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: Merge for-2635/s5p-audioBen Dooks2010-05-191-0/+16
|\ \ | | | | | | | | | Merge branch 'for-2635/s5p-audio' into for-linus/samsung2
| * | ARM: S5P6440: Add audio platform devicesJassi Brar2010-05-181-0/+3
| | | | | | | | | | | | | | | | | | | | | Define platform devices for all audio devices found on S5P6440 Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: S5P6442: Add audio platform devicesJassi Brar2010-05-181-0/+5
| | | | | | | | | | | | | | | | | | | | | Define platform devices for all audio devices found on S5P6442 Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: S5PV210: Add audio platform devicesJassi Brar2010-05-181-0/+8
| |/ | | | | | | | | | | | | Define platform devices for all audio devices found on S5PV210 Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: Merge for-2635/s5p-dmaBen Dooks2010-05-192-0/+110
|\ \ | | | | | | | | | | | | | | | | | | Merge branch 'for-2635/s5p-dma' into for-linus/samsung2 Conflicts: arch/arm/mach-s5pv210/Makefile
| * | S3C: DMA: Add api driver for PL330Jassi Brar2010-05-182-0/+110
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Latest Samsung SoCs have one or more PL330 as their DMACs. This patch implements the S3C DMA API for PL330 core driver. The design has been kept as generic as possible while keeping effort to add support for new SoCs to the minimum possible level. Some of the salient features of this driver are:- o Automatic scheduling of client requests onto DMAC if more than one DMAC can reach the peripheral. Factors, such as current load and number of exclusive but inactive peripherals that are supported by the DMAC, are used to decide suitability of a DMAC for a particular client. o CIRCULAR buffer option is supported. o The driver scales transparently with the number of DMACs and total peripherals in the platform, since all peripherals are added to the peripheral pool and DMACs to the controller pool. For most conservative use of memory, smallest driver size and best performance, we don't employ legacy data structures of the S3C DMA API. That should not have any affect since those data structures are completely invisible to the DMA clients. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: Merge for-2635/fb-updates1Ben Dooks2010-05-194-0/+60
|\ \ | | | | | | | | | Merge branch 'for-2635/fb-updates1' into for-linus/samsung2
| * | ARM: SAMSUNG: Set S3C_FB_MAX_WIN in <plat/fb.h>Ben Dooks2010-05-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the S3C_FB_MAX_WIN to the platform data to avoid having to include the registers with the platform data. Set S3C_FB_MAX_WIN to 5, which is the maximum that any of the current hardware can do and the cost of having it set to this for all is minimal (at least for the platform data case), then always leave this as the maximum for the systems supported. Also remove the inclusion of <mach/regs-fb.h> from the device definition in arch/arm/plat-samsung Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: S3C2416: Add arch supportYauhen Kharuzhy2010-05-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add arch/arm/mach-s3c2416 for support of the Samsung S3C2416 SoC. This patch adds support of the S3C2416 SoC, clocks, timers, and initial IRQ support (without support of secondary set of registers). Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com> [ben-linux@fluff.org: removed files to be reworked, fixed conflicts] [ben-linux@fluff.org: use s3c2443 reset instead of specific reset code] Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: SAMSUNG: Add s3c_disable_clocks() and tidy init+disable usageBen Dooks2010-05-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Add s3c_disable_clocks() and change the clock registration code to use the s3c_register_clocks() followed by s3c_disable_clocks() instead of the loops it was using. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: SAMSUNG: Move S3C6400 PLL code to <plat/pll.h> for re-useBen Dooks2010-05-101-0/+51
| | | | | | | | | | | | | | | | | | | | | The S3C6400 EPLL code matches the S3C2416 and compatible SoCs, so move it from mach-s3c64xx into <plat/pll.h> for easy reuse. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | | ARM: Merge for-2635/s3c6410-clockBen Dooks2010-05-191-0/+1
|\ \ \ | | | | | | | | | | | | Merge branch 'for-2635/s3c6410-clock' into for-linus/samsung2
| * | | ARM: S3C64XX: Add USB external clock definitionMaurus Cuelenaere2010-05-181-0/+1
| | |/ | |/| | | | | | | | | | | | | | | | This adds the xusbxti clock to S3C64XX platform. Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | | ARM: Merge for-2635/gpio2Ben Dooks2010-05-193-0/+86
|\ \ \ | | | | | | | | | | | | Merge branch 'for-2635/gpio2' into for-linus/samsung2
| * | | ARM: SAMSUNG: Add spinlock locking to GPIO banksBen Dooks2010-05-111-0/+14
| | |/ | |/| | | | | | | | | | | | | | | | | | | Add locking to each GPIO bank to allow for SMP capable code to use the gpiolib functions. See the gpio-core.h header file for more information. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: S3C24XX: Remove s3c2410_gpio_getcfg(), implement s3c_gpio_getcfg()Ben Dooks2010-05-062-0/+17
| | | | | | | | | | | | | | | | | | | | | Add s3c_gpio_getcfg() and change anything using s3c2410_gpio_getcfg() to use this instead. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: SAMSUNG: Add GPIO configuration read callsBen Dooks2010-05-061-0/+41
| | | | | | | | | | | | | | | | | | | | | Add the necessary 1,2 and 4 bit configuration read calls for the new gpio code to allow removal of the old s3c24xx gpio code. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: S3C24XX: Add the gpio pull configuration for pull-upBen Dooks2010-05-061-0/+11
| | | | | | | | | | | | | | | | | | | | | Add the necessary gpio configuration helper for the devices which have a single-bit pull-up resistor disabled. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| * | ARM: S3C24XX: Add initial s3c_gpio configuration codeBen Dooks2010-05-061-0/+3
| |/ | | | | | | | | | | | | | | | | | | Add support for s3c_gpio_setcfg() and s3c_gpio_setpull() implementations to get ready for removal of the specific code being used by s3c24xx. Also rename the s3c_gpio_setcfg_s3c24xx_banka to s3c_gpio_setcfg_s3c24xx_a as seen in the header file to correct a build warning. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: Merge for-2635/samsung-hwmonBen Dooks2010-05-191-0/+10
|\ \ | | | | | | | | | Merge branch 'for-2635/samsung-hwmon' into for-linus/samsung2
| * | ARM: SAMSUNG: Move HWMON from plat-s3c24xx to plat-samsungMaurus Cuelenaere2010-05-121-0/+10
| |/ | | | | | | | | | | | | | | | | Move HWMON platform definition from plat-s3c24xx to plat-samsung and adjust mach-bast to use the new s3c_hwmon_set_platdata(). This allows usage of dev-hwmon by other Samsung SoCs. Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: Merge for-2635/samsung-dmaBen Dooks2010-05-191-2/+2
|\ \ | | | | | | | | | Merge branch 'for-2635/samsung-dma' into for-linus/samsung2
| * | S3C: DMA: Change argument of s3c2410_dma_devconfigJassi Brar2010-05-171-2/+2
| |/ | | | | | | | | | | | | | | | | All other functions have the channel argument of type 'unsigned int' the s3c2410_dma_devconfig also accept the same value as argument but treat it as type 'int'. Remove this anomaly by make it 'unsigned int'. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* | ARM: SAMSUNG: Remove static of S5P SoCs sysclassKukjin Kim2010-05-121-0/+3
|/ | | | | | | | This patch removes static of s5p6440_sysclass, s5p6442_sysclass, and s5pv210_sysclass for defintion as extern. Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* ARM: SAMSUNG: Fix build error from stale define in <plat/uncompress.h>Ben Dooks2010-03-151-2/+0
| | | | | | | | | | | | | | | The decleration of error() as static in the platform specific uncompress code in arch/arm/plat-samsung/include/plat/uncomopress.h causes the build of the uncompressor to break. Remove it, as it is no longer needed. arch/arm/boot/compressed/decompress.o: In function `gunzip': /var/tmp/kernel-orig/arch/arm/boot/compressed/../../../../lib/decompress_inflate.c:67: undefined reference to `error' /var/tmp/kernel-orig/arch/arm/boot/compressed/../../../../lib/decompress_inflate.c:73: undefined reference to `error' /var/tmp/kernel-orig/arch/arm/boot/compressed/../../../../lib/decompress_inflate.c:80: undefined reference to `error' /var/tmp/kernel-orig/arch/arm/boot/compressed/../../../../lib/decompress_inflate.c:95: undefined reference to `error' /var/tmp/kernel-orig/arch/arm/boot/compressed/../../../../lib/decompress_inflate.c:152: undefined reference to `error' Signed-off-by: Ben Dooks <ben-linux@fluff.org>
* Merge branch 'for-linus' of ↵Linus Torvalds2010-03-123-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (56 commits) doc: fix typo in comment explaining rb_tree usage Remove fs/ntfs/ChangeLog doc: fix console doc typo doc: cpuset: Update the cpuset flag file Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed Remove drivers/parport/ChangeLog Remove drivers/char/ChangeLog doc: typo - Table 1-2 should refer to "status", not "statm" tree-wide: fix typos "ass?o[sc]iac?te" -> "associate" in comments No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h devres/irq: Fix devm_irq_match comment Remove reference to kthread_create_on_cpu tree-wide: Assorted spelling fixes tree-wide: fix 'lenght' typo in comments and code drm/kms: fix spelling in error message doc: capitalization and other minor fixes in pnp doc devres: typo fix s/dev/devm/ Remove redundant trailing semicolons from macros fix typo "definetly" -> "definitely" in comment tree-wide: s/widht/width/g typo in comments ... Fix trivial conflict in Documentation/laptops/00-INDEX
OpenPOWER on IntegriCloud