original_kernel/drivers/serial
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
..
cpm_uart
jsm
8250.c serial: fix device name reporting when minor space is shared between drivers 2008-10-13 09:51:44 -07:00
8250.h
8250_accent.c
8250_acorn.c
8250_boca.c
8250_early.c
8250_exar_st16c554.c
8250_fourport.c
8250_gsc.c
8250_hp300.c
8250_hub6.c
8250_mca.c
8250_pci.c serial_8250: pci_enable_device fail is not fully handled 2008-10-13 09:51:39 -07:00
8250_pnp.c
21285.c
68328serial.c
68328serial.h
68360serial.c
Kconfig serial: allow 8250 to be used on sparc 2008-10-13 09:51:40 -07:00
Makefile serial: allow 8250 to be used on sparc 2008-10-13 09:51:40 -07:00
amba-pl010.c
amba-pl011.c
atmel_serial.c
bfin_5xx.c Blackfin Serial Driver: Fix bug - request UART2/3 peripheral mapped interrupts in PIO mode 2008-10-13 09:51:38 -07:00
bfin_sport_uart.c
bfin_sport_uart.h
clps711x.c
crisv10.c tty: simplify ktermios allocation 2008-10-13 09:51:44 -07:00
crisv10.h
dz.c
dz.h
icom.c
icom.h
imx.c
ioc3_serial.c
ioc4_serial.c
ip22zilog.c
ip22zilog.h
kgdboc.c
m32r_sio.c
m32r_sio.h
m32r_sio_reg.h
mcf.c
mpc52xx_uart.c
mpsc.c
mux.c
netx-serial.c
of_serial.c
pmac_zilog.c
pmac_zilog.h
pnx8xxx_uart.c
pxa.c
s3c2400.c
s3c2410.c
s3c2412.c
s3c2440.c
sa1100.c
samsung.c
samsung.h
sb1250-duart.c
sc26xx.c
serial_core.c serial: fix device name reporting when minor space is shared between drivers 2008-10-13 09:51:44 -07:00
serial_cs.c
serial_ks8695.c
serial_lh7a40x.c
serial_txx9.c
sh-sci.c
sh-sci.h
sn_console.c
suncore.c
suncore.h
sunhv.c
sunsab.c
sunsab.h
sunsu.c
sunzilog.c
sunzilog.h
uartlite.c
ucc_uart.c
vr41xx_siu.c
zs.c
zs.h