davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
602cada851
kernel-ark/drivers/pcmcia
History
Linus Torvalds 1903ac54f8 Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  [PATCH] i386: export memory more than 4G through /proc/iomem
  [PATCH] 64bit Resource: finally enable 64bit resource sizes
  [PATCH] 64bit Resource: convert a few remaining drivers to use resource_size_t where needed
  [PATCH] 64bit resource: change pnp core to use resource_size_t
  [PATCH] 64bit resource: change pci core and arch code to use resource_size_t
  [PATCH] 64bit resource: change resource core to use resource_size_t
  [PATCH] 64bit resource: introduce resource_size_t for the start and end of struct resource
  [PATCH] 64bit resource: fix up printks for resources in misc drivers
  [PATCH] 64bit resource: fix up printks for resources in arch and core code
  [PATCH] 64bit resource: fix up printks for resources in pcmcia drivers
  [PATCH] 64bit resource: fix up printks for resources in video drivers
  [PATCH] 64bit resource: fix up printks for resources in ide drivers
  [PATCH] 64bit resource: fix up printks for resources in mtd drivers
  [PATCH] 64bit resource: fix up printks for resources in pci core and hotplug drivers
  [PATCH] 64bit resource: fix up printks for resources in networks drivers
  [PATCH] 64bit resource: fix up printks for resources in sound drivers
  [PATCH] 64bit resource: C99 changes for struct resource declarations

Fixed up trivial conflict in drivers/ide/pci/cmd64x.c (the printk that
was changed by the 64-bit resources had been deleted in the meantime ;)
2006-06-29 10:49:17 -07:00
..
at91_cf.c Fix AT91RM9200 build breakage 2006-04-14 18:38:01 -07:00
au1000_db1x00.c [PATCH] Alchemy PCMCIA: Fix config.h inclusion 2005-11-10 11:18:26 +01:00
au1000_generic.c [PATCH] pcmcia: kzalloc conversion 2006-01-06 00:28:06 +01:00
au1000_generic.h [PATCH] Alchemy PCMCIA: Fix config.h inclusion 2005-11-10 11:18:26 +01:00
au1000_pb1x00.c [PATCH] Alchemy PCMCIA: Fix config.h inclusion 2005-11-10 11:18:26 +01:00
au1000_xxs1500.c [PATCH] Alchemy PCMCIA: Fix config.h inclusion 2005-11-10 11:18:26 +01:00
cardbus.c [PATCH] yenta: auto-tune EnE bridges for CardBus cards 2005-09-26 13:09:20 +02:00
cirrus.h
cistpl.c [PATCH] pcmcia: remove include of config.h 2006-03-31 17:02:26 +02:00
cs_internal.h [PATCH] pcmcia: use bitfield instead of p_state and state 2006-03-31 17:26:33 +02:00
cs.c [PATCH] pcmcia: remove include of config.h 2006-03-31 17:02:26 +02:00
ds_internal.h [PATCH] pcmcia: remove export of pcmcia_release_configuration 2006-03-31 17:15:53 +02:00
ds.c [PATCH] pcmcia: missing pcmcia_get_socket() result check 2006-06-02 00:56:17 +02:00
hd64465_ss.c [PATCH] genirq: rename desc->handler to desc->chip 2006-06-29 10:26:21 -07:00
i82092.c [PATCH] pcmcia: remove include of config.h 2006-03-31 17:02:26 +02:00
i82092aa.h [PATCH] pcmcia: remove get_socket callback 2006-01-05 23:41:09 +01:00
i82365.c [PATCH] 64bit resource: fix up printks for resources in pcmcia drivers 2006-06-27 09:23:59 -07:00
i82365.h
Kconfig [PATCH] vrc4171: update config 2006-04-22 00:49:18 +02:00
m8xx_pcmcia.c [PATCH] spin/rwlock init cleanups 2006-06-27 17:32:39 -07:00
m32r_cfc.c [PATCH] pcmcia: remove get_socket callback 2006-01-05 23:41:09 +01:00
m32r_cfc.h
m32r_pcc.c [PATCH] pcmcia: remove get_socket callback 2006-01-05 23:41:09 +01:00
m32r_pcc.h
Makefile [PATCH] pcmcia: AT91RM9200 Compact Flash driver 2006-03-31 17:05:41 +02:00
o2micro.h
omap_cf.c [PATCH] handle errors returned by platform_get_irq*() 2006-03-20 13:42:57 -08:00
pcmcia_ioctl.c [PATCH] pcmcia Oopses fixes 2006-05-15 11:20:54 -07:00
pcmcia_resource.c [PATCH] pcmcia/pcmcia_resource.c: fix crash when using Cardbus cards 2006-04-22 00:49:19 +02:00
pd6729.c [PATCH] 64bit resource: fix up printks for resources in pcmcia drivers 2006-06-27 09:23:59 -07:00
pd6729.h
pxa2xx_base.c Create platform_device.h to contain all the platform device details. 2005-10-29 19:07:23 +01:00
pxa2xx_base.h
pxa2xx_lubbock.c
pxa2xx_mainstone.c [ARM] 3250/1: Change pxa2xx PCMCIA drivers to use platform_device_alloc 2006-01-10 17:16:12 +00:00
pxa2xx_sharpsl.c [ARM] 3478/1: SharpSL SCOOP: Fix potenial build failure 2006-04-18 23:18:53 +01:00
ricoh.h
rsrc_mgr.c [PATCH] pcmcia: size reduction if ioctl isn't compiled 2006-03-31 17:02:39 +02:00
rsrc_nonstatic.c [PATCH] 64bit Resource: convert a few remaining drivers to use resource_size_t where needed 2006-06-27 09:24:00 -07:00
sa11xx_base.c
sa11xx_base.h
sa1100_assabet.c
sa1100_badge4.c [ARM] Fix badge4 build error 2006-06-19 15:37:31 +01:00
sa1100_cerf.c [PATCH] pcmcia: remove include of config.h 2006-03-31 17:02:26 +02:00
sa1100_generic.c Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel 2005-10-31 07:32:56 -08:00
sa1100_generic.h
sa1100_h3600.c
sa1100_jornada720.c
sa1100_neponset.c
sa1100_shannon.c
sa1100_simpad.c
sa1111_generic.c [ARM] Fix sparse warnings 2005-10-28 14:29:43 +01:00
sa1111_generic.h
soc_common.c [PATCH] pcmcia: kzalloc conversion 2006-01-06 00:28:06 +01:00
soc_common.h
socket_sysfs.c [PATCH] pcmcia: remove include of config.h 2006-03-31 17:02:26 +02:00
tcic.c [PATCH] 64bit resource: fix up printks for resources in pcmcia drivers 2006-06-27 09:23:59 -07:00
tcic.h
ti113x.h [PATCH] pcmcia: remove include of config.h 2006-03-31 17:02:26 +02:00
topic.h
vg468.h
vrc4171_card.c [PATCH] Don't pass boot parameters to argv_init[] 2006-03-31 12:18:53 -08:00
vrc4173_cardu.c [PATCH] Don't pass boot parameters to argv_init[] 2006-03-31 12:18:53 -08:00
vrc4173_cardu.h Update Yoichi Yuasa's email address. 2006-01-10 13:39:07 +00:00
yenta_socket.c [PATCH] pcmcia: kzalloc conversion 2006-01-06 00:28:06 +01:00
yenta_socket.h