linux/drivers/char/pcmcia/ipwireless
Linus Torvalds 2be4ff2f08 Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits)
  pcmcia: ioctl-internal definitions
  pcmcia: cistpl header cleanup
  pcmcia: remove unused argument to pcmcia_parse_tuple()
  pcmcia: card services header cleanup
  pcmcia: device_id header cleanup
  pcmcia: encapsulate ioaddr_t
  pcmcia: cleanup device driver header file
  pcmcia: cleanup socket services header file
  pcmcia: merge ds_internal.h into cs_internal.h
  pcmcia: cleanup cs_internal.h
  pcmcia: cs_internal.h is internal
  pcmcia: use dev_printk for cs_error()
  pcmcia: remove CS_ error codes alltogether
  pcmcia: deprecate CS_BAD_TUPLE
  pcmcia: deprecate CS_BAD_ARGS
  pcmcia: deprecate CS_BAD_BASE, CS_BAD_IRQ, CS_BAD_OFFSET and CS_BAD_SIZE
  pcmcia: deprecate CS_BAD_ATTRIBUTE, CS_BAD_TYPE and CS_BAD_PAGE
  pcmcia: deprecate CS_NO_MORE_ITEMS
  pcmcia: deprecate CS_IN_USE
  pcmcia: deprecate CS_CONFIGURATION_LOCKED
  ...

Fix trivial conflict in drivers/pcmcia/ds.c manually
2008-10-13 14:12:40 -07:00
..
hardware.c ipwireless: fix compile failure 2008-07-28 15:12:37 -07:00
hardware.h ipwireless: Constify buffer variables 2008-07-28 08:28:03 -07:00
main.c pcmcia: remove unused argument to pcmcia_parse_tuple() 2008-08-31 15:50:33 +02:00
main.h ipwireless: Explicitly request io and mem regions 2008-07-28 08:28:03 -07:00
Makefile ipwireless: driver for PC Card 3G/UMTS modem 2008-02-07 17:19:49 -08:00
network.c ipwireless: Preallocate received packet buffers with MRU size 2008-07-28 08:28:03 -07:00
network.h ipwireless: Preallocate received packet buffers with MRU size 2008-07-28 08:28:03 -07:00
setup_protocol.h ipwireless: driver for PC Card 3G/UMTS modem 2008-02-07 17:19:49 -08:00
tty.c tty: ipw need reworking 2008-10-13 09:51:40 -07:00
tty.h ipwireless: driver for PC Card 3G/UMTS modem 2008-02-07 17:19:49 -08:00