linux/drivers/net/irda
Linus Torvalds 7cc4e87f91 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (236 commits)
  [ARM] 5300/1: fixup spitz reset during boot
  [ARM] 5295/1: make ZONE_DMA optional
  [ARM] 5239/1: Palm Zire 72 power management support
  [ARM] 5298/1: Drop desc_handle_irq()
  [ARM] 5297/1: [KS8695] Fix two compile-time warnings
  [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
  [ARM] pxa: allow multi-machine PCMCIA builds
  [ARM] pxa: add preliminary CPUFREQ support for PXA3xx
  [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
  [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
  [ARM] pxa/zylonite: add support for USB OHCI
  [ARM] ohci-pxa27x: use ioremap() and offset for register access
  [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
  [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
  [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
  [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
  [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
  [ARM] pxa: simplify DMA register definitions
  [ARM] pxa: make additional DCSR bits valid for PXA3xx
  [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
  ...

Fixed up conflicts in
	arch/arm/mach-versatile/core.c
	sound/soc/pxa/pxa2xx-ac97.c
	sound/soc/pxa/pxa2xx-i2s.c
manually.
2008-10-11 10:09:45 -07:00
..
act200l-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
actisys-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
ali-ircc.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
ali-ircc.h irda: Remove useless pm_dev references 2008-07-08 03:08:16 -07:00
au1k_ir.c drivers/net/irda/au1k_ir: fix obvious irq handler bugs 2007-10-29 05:42:18 -04:00
au1000_ircc.h irda: Remove useless pm_dev references 2008-07-08 03:08:16 -07:00
donauboe.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
donauboe.h Fix misspellings collected by members of KJ list. 2007-05-09 07:14:03 +02:00
ep7211-sir.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
esi-sir.c
girbil-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
irda-usb.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
irda-usb.h irda-usb endianness annotations and fixes 2008-05-21 16:55:59 -07:00
irtty-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
irtty-sir.h
Kconfig irda: net/irda build fix: mcs7780 2008-06-09 15:47:38 -07:00
kingsun-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
ks959-sir.c [NET]: Nuke SET_MODULE_OWNER macro. 2007-10-10 16:51:13 -07:00
ksdazzle-sir.c [IRDA]: Oops fix for ksdazzle 2007-10-10 16:54:50 -07:00
litelink-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
ma600-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
Makefile [IrDA]: Irport removal - part 1 2008-01-28 15:08:10 -08:00
mcp2120-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
mcs7780.c net: use get/put_unaligned_* helpers 2008-04-29 08:06:27 -07:00
mcs7780.h
nsc-ircc.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
nsc-ircc.h nsc-ircc: default to dongle type 9 on IBM hardware 2008-07-30 17:19:35 -07:00
old_belkin-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
pxaficp_ir.c [ARM] pxa: simplify DMA register definitions 2008-10-07 19:12:56 +01:00
sa1100_ir.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
sir_dev.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
sir_dongle.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
sir-dev.h WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
smsc-ircc2.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
smsc-ircc2.h irda: remove CVS keywords 2008-06-11 21:00:41 -07:00
smsc-sio.h
stir4200.c net: use get/put_unaligned_* helpers 2008-04-29 08:06:27 -07:00
tekram-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
toim3232-sir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
via-ircc.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
via-ircc.h irda: Remove useless pm_dev references 2008-07-08 03:08:16 -07:00
vlsi_ir.c irda: follow lspci device/vendor style 2008-09-22 19:20:06 -07:00
vlsi_ir.h irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
w83977af_ir.c irda: replace __FUNCTION__ with __func__ 2008-07-30 17:20:18 -07:00
w83977af_ir.h Convert files to UTF-8 and some cleanups 2007-10-19 23:21:04 +02:00
w83977af.h