OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/arch/arm/plat-mxc/include/mach
History
Linus Torvalds 008d23e485 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
 		2011-01-13 10:05:56 -08:00
..
3ds_debugboard.h mxc: add common debug board for 3-stack platforms 2010-07-26 14:29:19 +02:00
audmux.h MXC: Add a digital audio multiplexer driver 2009-11-14 10:30:39 +01:00
board-mx31ads.h Fixing ethernet driver compilation error for i.MX31 ADS board 2010-10-19 18:45:01 +02:00
board-mx31lilly.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
board-mx31lite.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
board-mx31moboard.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
board-pcm038.h ARM: mxc: grammar fix 2010-06-24 15:40:36 +02:00
clkdev.h [ARM] MXC: add clkdev support 2009-03-13 10:33:50 +01:00
clock.h arm/imx: remove #ifndef CONFIG_COMMON_CLKDEV block 2010-02-24 10:07:03 +01:00
common.h arm: mx50: add core functions support except clock 2011-01-03 09:39:29 +01:00
debug-macro.S ARM: imx/debug-macro: rework using the new io mapping macro 2010-11-17 08:58:11 +01:00
devices-common.h ARM: mx5: add support for the two watchdog modules 2010-12-07 20:03:11 +01:00
dma.h dmaengine: Add Freescale i.MX SDMA support 2010-10-05 15:49:26 -07:00
entry-macro.S mx51: support FIQ on TZIC, revised 2010-12-14 09:54:37 +01:00
esdhc.h arm: imx: add generic esdhc device 2010-10-11 15:22:05 +02:00
eukrea-baseboards.h mx5: add cpuimx51sd module and its baseboard 2010-10-19 18:45:00 +02:00
gpio.h iMX51: introduce IMX_GPIO_NR 2010-12-03 11:05:16 +01:00
hardware.h arm: mx50: add core functions support except clock 2011-01-03 09:39:29 +01:00
i2c.h i2c: iMX/MXC support 2009-04-07 10:18:32 +01:00
iim.h [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
imx-uart.h Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2009-06-14 13:42:43 -07:00
imxfb.h ARM: imx: dynamically register imx-fb devices 2010-11-17 10:01:27 +01:00
io.h [ARM] MXC: do not include mach/hardware.h from mach/memory.h 2008-12-18 16:40:14 +01:00
iomux-mx1.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +01:00
iomux-mx2x.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +01:00
iomux-mx3.h MX3X: Add Keypad device definition for MX3X arch 2010-05-19 14:22:44 +02:00
iomux-mx21.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +01:00
iomux-mx25.h mx25: add PWM4 to iomux 2010-07-26 14:18:33 +02:00
iomux-mx27.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +01:00
iomux-mx35.h arm/imx: remove "NO_PAD_CTRL" from Copyright statements 2010-02-24 10:07:00 +01:00
iomux-mx50.h arm: mx50: add core functions support except clock 2011-01-03 09:39:29 +01:00
iomux-mx51.h ARM i.MX51: Full iomux support 2010-12-15 14:42:23 +01:00
iomux-mx53.h ARM i.MX53: Make MX53 EVK bootable 2011-01-04 12:00:23 +01:00
iomux-mxc91231.h ARM: mxc: remove paragraphs with old address of the FSF 2010-06-30 09:00:28 +02:00
iomux-v1.h arm/imx/iomux-v1: check for invalid modes in mxc_gpio_mode 2010-02-24 10:07:16 +01:00
iomux-v3.h ARM i.MX51: Full iomux support 2010-12-15 14:42:23 +01:00
iomux.h arm/imx/iomux-v1: rename header file 2010-02-24 10:07:15 +01:00
ipu.h i.MX31: Image Processing Unit DMA and IRQ drivers 2009-01-19 15:36:21 -07:00
iram.h ARM: imx: Add iram allocator functions 2010-10-19 18:44:57 +02:00
irqs.h Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
memory.h arm: mx50: add core functions support except clock 2011-01-03 09:39:29 +01:00
mmc.h mxcmmc: add card detect through DAT3 possibility 2010-07-26 14:17:46 +02:00
mx1.h ARM: mx25: move registration of gpios to plat-mxc/gpio.c 2010-11-17 10:01:38 +01:00
mx1_camera.h V4L/DVB (11350): Add camera (CSI) driver for MX1 2009-04-06 21:43:58 -03:00
mx2_cam.h mx2_camera: Add soc_camera support for i.MX25/i.MX27 2010-07-28 09:28:36 +02:00
mx2x.h ARM: imx: remove deprecated symbols as all users are gone now 2010-11-17 08:58:12 +01:00
mx3_camera.h ARM: mxc: remove paragraphs with old address of the FSF 2010-06-30 09:00:28 +02:00
mx3fb.h i.MX31: framebuffer driver 2009-02-26 14:00:58 -07:00
mx3x.h ARM: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01:00
mx21-usbhost.h USB: MXC: Add i.MX21 specific USB host controller driver. 2010-03-02 14:52:55 -08:00
mx21.h ARM: mx25: move registration of gpios to plat-mxc/gpio.c 2010-11-17 10:01:38 +01:00
mx25.h ARM: mx25: fix offset for usb host controller 2010-12-03 11:05:10 +01:00
mx27.h ARM: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01:00
mx31.h ARM: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01:00
mx35.h ARM: imx: Get the silicon version from the IIM module 2010-11-28 19:51:47 +01:00
mx50.h arm: mx50: add core functions support except clock 2011-01-03 09:39:29 +01:00
mx51.h ARM i.MX51: rename IPU irqs 2011-01-03 16:31:03 +01:00
mx53.h ARM: imx: Add core definitions for MX53 2010-11-24 10:09:04 +01:00
mxc.h arm: mx50: add core functions support except clock 2011-01-03 09:39:29 +01:00
mxc91231.h ARM: imx: change static io mapping to use a function 2010-11-17 08:58:11 +01:00
mxc_ehci.h MX51: Add support for usb host 2 2011-01-03 10:20:23 +01:00
mxc_nand.h Merge branch 'imx/for-2.6.36' of git://git.pengutronix.de/git/ukl/linux-2.6 into HEAD 2010-07-26 14:27:25 +02:00
sdma.h dmaengine i.MX SDMA: Allow to run without firmware 2010-12-03 11:04:54 +01:00
spi.h spi: add SPI driver for most known i.MX SoCs 2009-09-23 07:39:43 -07:00
ssi.h ASoC: imx-ssi.c: add new choices to platform configuration 2010-06-03 19:00:16 +01:00
system.h i.MX31 and i.MX35 : fix errate TLSbo65953 and ENGcm09472 2010-10-19 18:44:58 +02:00
timex.h ARM: mxc: remove paragraphs with old address of the FSF 2010-06-30 09:00:28 +02:00
ulpi.h MXC: Add support for ULPI Viewports 2009-11-14 10:29:15 +01:00
uncompress.h ARM i.MX53: Make MX53 EVK bootable 2011-01-04 12:00:23 +01:00
usb.h imx: exit functions can/should be void 2009-05-07 16:15:58 +02:00
vmalloc.h ARM: mxc: remove paragraphs with old address of the FSF 2010-06-30 09:00:28 +02:00