iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers/pcmcia
History
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
..
at91_cf.c
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
2008-08-07 09:55:48 +01:00
au1000_db1x00.c
pcmcia: replace remaining __FUNCTION__ occurrences
2008-05-01 08:04:00 -07:00
au1000_generic.c
pcmcia: encapsulate ioaddr_t
2008-08-29 09:43:14 +02:00
au1000_generic.h
pcmcia: encapsulate ioaddr_t
2008-08-29 09:43:14 +02:00
au1000_pb1x00.c
pcmcia: cs_internal.h is internal
2008-08-25 23:16:57 +02:00
au1000_xxs1500.c
pcmcia: cs_internal.h is internal
2008-08-25 23:16:57 +02:00
bfin_cf_pcmcia.c
pcmcia: add support CompactFlash PCMCIA support for Blackfin.
2008-06-24 15:33:39 +02:00
cardbus.c
pcmcia: deprecate CS_SUCCESS
2008-08-23 02:29:26 +02:00
cirrus.h
…
cistpl.c
pcmcia: remove unused argument to pcmcia_parse_tuple()
2008-08-31 15:50:33 +02:00
cs_internal.h
pcmcia: remove unused argument to pcmcia_parse_tuple()
2008-08-31 15:50:33 +02:00
cs.c
pcmcia: card services header cleanup
2008-08-31 15:25:47 +02:00
ds.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2008-10-13 14:12:40 -07:00
electra_cf.c
PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures
2008-07-24 10:47:21 -07:00
hd64465_ss.c
pcmcia: cs_internal.h is internal
2008-08-25 23:16:57 +02:00
i82092.c
pcmcia: remove CVS keywords
2008-06-24 15:33:37 +02:00
i82092aa.h
pcmcia: remove CVS keywords
2008-06-24 15:33:37 +02:00
i82365.c
pcmcia: don't add extra DEBUG cflag
2008-08-23 01:55:06 +02:00
i82365.h
…
Kconfig
Merge branch 'viper-for-rmk' of git://www.misterjones.org/linux-2.6-arm
2008-10-07 19:08:32 +01:00
m8xx_pcmcia.c
pcmcia: don't add extra DEBUG cflag
2008-08-23 01:55:06 +02:00
m32r_cfc.c
pcmcia: don't add extra DEBUG cflag
2008-08-23 01:55:06 +02:00
m32r_cfc.h
…
m32r_pcc.c
pcmcia: don't add extra DEBUG cflag
2008-08-23 01:55:06 +02:00
m32r_pcc.h
…
Makefile
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2008-10-13 14:12:40 -07:00
o2micro.h
pcmcia: use dev_printk and dev_dbg in yenta_socket
2008-08-23 01:49:44 +02:00
omap_cf.c
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
2008-08-07 09:55:48 +01:00
pcmcia_ioctl.c
pcmcia: remove unused argument to pcmcia_parse_tuple()
2008-08-31 15:50:33 +02:00
pcmcia_resource.c
pcmcia: remove unused argument to pcmcia_parse_tuple()
2008-08-31 15:50:33 +02:00
pd6729.c
pcmcia: silence section mismatch warnings from pci_driver variables
2008-05-01 08:04:00 -07:00
pd6729.h
…
pxa2xx_base.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2008-10-13 14:12:40 -07:00
pxa2xx_base.h
[ARM] Fix suspend oops caused by PXA2xx PCMCIA driver
2006-10-28 22:42:56 +01:00
pxa2xx_cm_x2xx.c
[ARM] 5283/1: pxa: add CM-X255 pcmcia support
2008-10-07 12:08:02 +01:00
pxa2xx_cm_x255.c
[ARM] 5283/1: pxa: add CM-X255 pcmcia support
2008-10-07 12:08:02 +01:00
pxa2xx_cm_x270.c
[ARM] 5283/1: pxa: add CM-X255 pcmcia support
2008-10-07 12:08:02 +01:00
pxa2xx_lubbock.c
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
2008-08-07 09:55:48 +01:00
pxa2xx_mainstone.c
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
2008-08-07 09:55:48 +01:00
pxa2xx_palmld.c
[ARM] 5199/1: PalmLD: PCMCIA driver
2008-08-16 16:37:06 +01:00
pxa2xx_palmtx.c
[ARM] 5198/1: PalmTX: PCMCIA fixes
2008-08-16 16:35:33 +01:00
pxa2xx_sharpsl.c
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
2008-08-07 09:55:48 +01:00
pxa2xx_trizeps4.c
[ARM] pxa: trizeps4: remove unused variable
2008-10-07 15:52:03 +01:00
pxa2xx_viper.c
Add support for the Arcom/Eurotech Viper SBC CompactFlash card slot
2008-09-09 17:41:53 +02:00
ricoh.h
…
rsrc_mgr.c
pcmcia: carve out ioctl adjust function to pcmcia_ioctl
2008-06-24 15:33:42 +02:00
rsrc_nonstatic.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2008-10-13 14:12:40 -07:00
sa11xx_base.c
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
2008-08-07 09:55:48 +01:00
sa11xx_base.h
…
sa1100_assabet.c
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
2008-08-07 09:55:48 +01:00
sa1100_badge4.c
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
2008-08-07 09:55:48 +01:00
sa1100_cerf.c
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
2008-08-07 09:55:48 +01:00
sa1100_generic.c
Remove obsolete #include <linux/config.h>
2006-06-30 19:25:36 +02:00
sa1100_generic.h
…
sa1100_h3600.c
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
2008-08-07 09:55:48 +01:00
sa1100_jornada720.c
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
2008-08-07 09:55:48 +01:00
sa1100_neponset.c
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
2008-08-07 09:55:48 +01:00
sa1100_shannon.c
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
2008-08-07 09:55:48 +01:00
sa1100_simpad.c
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
2008-08-07 09:55:48 +01:00
sa1111_generic.c
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
2008-08-07 09:55:48 +01:00
sa1111_generic.h
…
soc_common.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2008-10-13 14:12:40 -07:00
soc_common.h
pcmcia: cs_internal.h is internal
2008-08-25 23:16:57 +02:00
socket_sysfs.c
pcmcia: only copy CIS override data once
2008-08-02 18:56:49 +02:00
tcic.c
pcmcia: don't add extra DEBUG cflag
2008-08-23 01:55:06 +02:00
tcic.h
…
ti113x.h
pcmcia: use dev_printk and dev_dbg in yenta_socket
2008-08-23 01:49:44 +02:00
topic.h
[PATCH] yenta: make ToPIC95 bridges work with 16bit cards
2005-09-07 16:57:21 -07:00
vg468.h
…
vrc4171_card.c
Driver core: more fallout from class_device changes for pcmcia
2007-02-23 14:52:09 -08:00
vrc4173_cardu.c
IRQ: Maintain regs pointer globally rather than passing to IRQ handlers
2006-10-05 15:10:12 +01:00
vrc4173_cardu.h
Update Yoichi Yuasa's email address.
2006-01-10 13:39:07 +00:00
yenta_socket.c
pcmcia: use dev_printk and dev_dbg in yenta_socket
2008-08-23 01:49:44 +02:00
yenta_socket.h
[PATCH] yenta: make ToPIC95 bridges work with 16bit cards
2005-09-07 16:57:21 -07:00