2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-25 05:34:00 +08:00
linux-next/drivers/isdn/hisax
Linus Torvalds 1685e633b3 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:
  pcmcia: avoid buffer overflow in pcmcia_setup_isa_irq
  pcmcia: do not request windows if you don't need to
  pcmcia: insert PCMCIA device resources into resource tree
  pcmcia: export resource information to sysfs
  pcmcia: use struct resource for PCMCIA devices, part 2
  pcmcia: remove memreq_t
  pcmcia: move local definitions out of include/pcmcia/cs.h
  pcmcia: do not use io_req_t when calling pcmcia_request_io()
  pcmcia: do not use io_req_t after call to pcmcia_request_io()
  pcmcia: use struct resource for PCMCIA devices
  pcmcia: clean up cs.h
  pcmcia: use pcmica_{read,write}_config_byte
  pcmcia: remove cs_types.h
  pcmcia: remove unused flag, simplify headers
  pcmcia: remove obsolete CS_EVENT_ definitions
  pcmcia: split up central event handler
  pcmcia: simplify event callback
  pcmcia: remove obsolete ioctl

Conflicts in:
 - drivers/staging/comedi/drivers/*
 - drivers/staging/wlags49_h2/wl_cs.c
due to dev_info_t and whitespace changes
2010-08-06 12:25:06 -07:00
..
amd7930_fn.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
amd7930_fn.h
arcofi.c headers: remove sched.h from interrupt.h 2009-10-11 11:20:58 -07:00
arcofi.h
asuscom.c isdn: replace remaining __FUNCTION__ occurrences 2008-04-28 08:58:34 -07:00
avm_a1.c [ISDN] Hisax: eliminate many unnecessary references to CardType[] 2008-04-20 18:22:31 -04:00
avm_a1p.c
avm_pci.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
avma1_cs.c pcmcia: do not use io_req_t when calling pcmcia_request_io() 2010-08-03 09:04:11 +02:00
bkm_a4t.c PCI: push deprecated pci_find_device() function to last user 2010-02-22 16:17:01 -08:00
bkm_a8.c PCI: push deprecated pci_find_device() function to last user 2010-02-22 16:17:01 -08:00
bkm_ax.h
callc.c fix comment/printk typos concerning "already" 2010-07-11 21:45:40 +02:00
config.c isdn/hisax: Convert pci_table entries to PCI_VDEVICE (if PCI_ANY_ID is used) 2010-07-15 19:05:24 -07:00
diva.c PCI: push deprecated pci_find_device() function to last user 2010-02-22 16:17:01 -08:00
elsa_cs.c pcmcia: do not use io_req_t when calling pcmcia_request_io() 2010-08-03 09:04:11 +02:00
elsa_ser.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
elsa.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
enternow_pci.c PCI: push deprecated pci_find_device() function to last user 2010-02-22 16:17:01 -08:00
fsm.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
fsm.h
gazel.c PCI: push deprecated pci_find_device() function to last user 2010-02-22 16:17:01 -08:00
hfc4s8s_l1.c Merge branch 'master' into for-next 2010-04-23 02:08:44 +02:00
hfc4s8s_l1.h
hfc_2bds0.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hfc_2bds0.h
hfc_2bs0.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hfc_2bs0.h
hfc_pci.c PCI: push deprecated pci_find_device() function to last user 2010-02-22 16:17:01 -08:00
hfc_pci.h
hfc_sx.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hfc_sx.h
hfc_usb.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hfc_usb.h
hfcscard.c drivers/isdn/hisax: fix sparse warning: Should it be static? 2009-02-27 01:00:42 -08:00
hisax_cfg.h
hisax_debug.h isdn: replace remaining __FUNCTION__ occurrences 2008-04-28 08:58:34 -07:00
hisax_fcpcipnp.c hisax_fcpcipnp: fix broken isapnp device table. 2010-05-19 17:33:38 +09:30
hisax_fcpcipnp.h
hisax_if.h
hisax_isac.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hisax_isac.h
hisax.h PCI: push deprecated pci_find_device() function to last user 2010-02-22 16:17:01 -08:00
hscx_irq.c isdn: hisax: Fix test in waitforxfw 2009-11-04 08:31:19 -08:00
hscx.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
hscx.h
icc.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
icc.h
ipac.h
ipacx.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
ipacx.h
isac.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
isac.h
isar.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
isar.h
isdnl1.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
isdnl1.h
isdnl2.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
isdnl2.h
isdnl3.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
isdnl3.h
isurf.c [ISDN] Hisax: eliminate many unnecessary references to CardType[] 2008-04-20 18:22:31 -04:00
ix1_micro.c isdn: replace remaining __FUNCTION__ occurrences 2008-04-28 08:58:34 -07:00
jade_irq.c
jade.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
jade.h
Kconfig PCI: push deprecated pci_find_device() function to last user 2010-02-22 16:17:01 -08:00
l3_1tr6.c ISDN: ARRAY_SIZE changes 2009-07-25 20:23:05 +02:00
l3_1tr6.h
l3dss1.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
l3dss1.h
l3ni1.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
l3ni1.h
lmgr.c
Makefile ISDN: Make isdnhdlc usable for other ISDN drivers 2009-07-25 20:15:21 +02:00
mic.c [ISDN] Hisax: eliminate many unnecessary references to CardType[] 2008-04-20 18:22:31 -04:00
netjet.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
netjet.h [ISDN] Hisax: eliminate many unnecessary references to CardType[] 2008-04-20 18:22:31 -04:00
niccy.c PCI: push deprecated pci_find_device() function to last user 2010-02-22 16:17:01 -08:00
nj_s.c PCI: push deprecated pci_find_device() function to last user 2010-02-22 16:17:01 -08:00
nj_u.c PCI: push deprecated pci_find_device() function to last user 2010-02-22 16:17:01 -08:00
q931.c drivers: isdn: use kernel macros to convert hex digit 2010-07-15 19:05:24 -07:00
s0box.c [ISDN] Hisax: eliminate many unnecessary references to CardType[] 2008-04-20 18:22:31 -04:00
saphir.c [ISDN] Hisax: eliminate many unnecessary references to CardType[] 2008-04-20 18:22:31 -04:00
sedlbauer_cs.c pcmcia: do not request windows if you don't need to 2010-08-03 09:04:21 +02:00
sedlbauer.c PCI: push deprecated pci_find_device() function to last user 2010-02-22 16:17:01 -08:00
sportster.c [ISDN] Hisax: eliminate many unnecessary references to CardType[] 2008-04-20 18:22:31 -04:00
st5481_b.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
st5481_d.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
st5481_init.c
st5481_usb.c ISDN: Add support for none reverse bitstreams to isdnhdc 2009-07-25 20:16:01 +02:00
st5481.h ISDN: Make isdnhdlc usable for other ISDN drivers 2009-07-25 20:15:21 +02:00
tei.c fix comment/printk typos concerning "already" 2010-07-11 21:45:40 +02:00
teleint.c [ISDN] Hisax: eliminate many unnecessary references to CardType[] 2008-04-20 18:22:31 -04:00
teles0.c drivers/isdn/hisax: fix sparse warning: Should it be static? 2009-02-27 01:00:42 -08:00
teles3.c drivers/isdn/hisax: fix sparse warning: Should it be static? 2009-02-27 01:00:42 -08:00
teles_cs.c pcmcia: do not use io_req_t when calling pcmcia_request_io() 2010-08-03 09:04:11 +02:00
telespci.c PCI: push deprecated pci_find_device() function to last user 2010-02-22 16:17:01 -08:00
w6692.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
w6692.h