Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-21 02:21:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
d51e9b0d94
linux/drivers/pcmcia
History
Linus Torvalds 517d08699b Merge branch 'akpm' 
* akpm: (182 commits)
  fbdev: bf54x-lq043fb: use kzalloc over kmalloc/memset
  fbdev: *bfin*: fix __dev{init,exit} markings
  fbdev: *bfin*: drop unnecessary calls to memset
  fbdev: bfin-t350mcqb-fb: drop unused local variables
  fbdev: blackfin has __raw I/O accessors, so use them in fb.h
  fbdev: s1d13xxxfb: add accelerated bitblt functions
  tcx: use standard fields for framebuffer physical address and length
  fbdev: add support for handoff from firmware to hw framebuffers
  intelfb: fix a bug when changing video timing
  fbdev: use framebuffer_release() for freeing fb_info structures
  radeon: P2G2CLK_ALWAYS_ONb tested twice, should 2nd be P2G2CLK_DAC_ALWAYS_ONb?
  s3c-fb: CPUFREQ frequency scaling support
  s3c-fb: fix resource releasing on error during probing
  carminefb: fix possible access beyond end of carmine_modedb[]
  acornfb: remove fb_mmap function
  mb862xxfb: use CONFIG_OF instead of CONFIG_PPC_OF
  mb862xxfb: restrict compliation of platform driver to PPC
  Samsung SoC Framebuffer driver: add Alpha Channel support
  atmel-lcdc: fix pixclock upper bound detection
  offb: use framebuffer_alloc() to allocate fb_info struct
  ...

Manually fix up conflicts due to kmemcheck in mm/slab.c
2009-06-16 19:50:13 -07:00
..
at91_cf.c drivers/pcmcia: use nr_irqs 2008-10-16 16:52:06 +02:00
au1000_db1x00.c
au1000_generic.c platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver' 2009-03-24 16:38:25 -07: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: blackfin: fix bug - add missing ; to MODULE macro 2008-12-15 16:27:06 -08:00
cardbus.c pcmcia: deprecate CS_SUCCESS 2008-08-23 02:29:26 +02:00
cirrus.h
cistpl.c pcmcia: add braces in error path 2008-11-02 19:55:45 +01:00
cs_internal.h pcmcia: remove unused argument to pcmcia_parse_tuple() 2008-08-31 15:50:33 +02:00
cs.c pcmcia: ensure correct logging in do_io_probe 2008-11-09 21:47:47 +01:00
ds.c pcmcia: remove driver_data direct access of struct device 2009-06-15 21:30:27 -07:00
electra_cf.c powerpc: Change u64/s64 to a long long integer type 2009-01-13 14:47:59 +11: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 platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver' 2009-03-24 16:38:25 -07:00
i82365.h
Kconfig [ARM] pxa/stargate2: add support for Compact Flash/PCMCIA 2009-06-05 10:46:32 +08:00
m8xx_pcmcia.c pcmcia: don't add extra DEBUG cflag 2008-08-23 01:55:06 +02:00
m32r_cfc.c platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver' 2009-03-24 16:38:25 -07:00
m32r_cfc.h
m32r_pcc.c platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver' 2009-03-24 16:38:25 -07:00
m32r_pcc.h
Makefile [ARM] pxa/stargate2: add support for Compact Flash/PCMCIA 2009-06-05 10:46:32 +08: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 use printk_once() in several places 2009-06-16 19:47:50 -07:00
pcmcia_resource.c pcmcia: fix indentation & braces disagreement - add braces 2008-11-01 23:39:11 +01:00
pd6729.c
pd6729.h
pxa2xx_base.c [ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0 2009-03-28 19:24:39 +08:00
pxa2xx_base.h
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] 5442/1: pxa/cm-x255: fix reverse RDY gpios in PCMCIA driver 2009-04-02 11:02:32 +01:00
pxa2xx_cm_x270.c [ARM] pxa: remove unnecessary #include of pxa-regs.h and hardware.h 2009-03-09 21:22:38 +08:00
pxa2xx_e740.c [ARM] pxa: remove unnecessary #include of pxa-regs.h and hardware.h 2009-03-09 21:22:38 +08:00
pxa2xx_lubbock.c [ARM] pxa: remove unnecessary #include of pxa-regs.h and hardware.h 2009-03-09 21:22:38 +08:00
pxa2xx_mainstone.c [ARM] pxa: move pxa2xx chip selects definitions out of pxa-regs.h 2009-03-09 21:22:40 +08:00
pxa2xx_palmld.c [ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0 2009-03-28 19:24:39 +08:00
pxa2xx_palmtx.c [ARM] 5198/1: PalmTX: PCMCIA fixes 2008-08-16 16:35:33 +01:00
pxa2xx_sharpsl.c [ARM] 5458/1: pcmcia: pxa2xx-sharpsl: check if we do have Scoop config 2009-04-23 23:25:40 +01:00
pxa2xx_stargate2.c [ARM] pxa/stargate2: add support for Compact Flash/PCMCIA 2009-06-05 10:46:32 +08:00
pxa2xx_trizeps4.c [ARM] pxa: move pxa2xx chip selects definitions out of pxa-regs.h 2009-03-09 21:22:40 +08:00
pxa2xx_viper.c [ARM] pxa: remove unnecessary #include of pxa-regs.h and hardware.h 2009-03-09 21:22:38 +08:00
ricoh.h
rsrc_mgr.c pcmcia: struct device - replace bus_id with dev_name(), dev_set_name() 2009-03-24 16:38:22 -07:00
rsrc_nonstatic.c pcmcia: struct device - replace bus_id with dev_name(), dev_set_name() 2008-11-02 15:05:51 +01:00
sa11xx_base.c [ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h 2009-03-25 10:21:35 +00: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 platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver' 2009-03-24 16:38:25 -07:00
sa1100_generic.h
sa1100_h3600.c [ARM] 5426/1: h3600: remove clr_h3600_egpio/set_h3600_egpio helpers 2009-03-15 20:08:18 +00: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] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h 2009-03-25 10:21:35 +00:00
sa1111_generic.h
soc_common.c [ARM] pxa: move PCMCIA definitions out of pxa-regs.h into pxa2xx_base.c 2009-03-09 21:22:39 +08:00
soc_common.h [ARM] pxa: move PCMCIA definitions out of pxa-regs.h into pxa2xx_base.c 2009-03-09 21:22:39 +08:00
socket_sysfs.c pcmcia: only copy CIS override data once 2008-08-02 18:56:49 +02:00
tcic.c platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver' 2009-03-24 16:38:25 -07: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
vg468.h
vrc4171_card.c platform driver: fix incorrect use of 'platform_bus_type' with 'struct device_driver' 2009-03-24 16:38:25 -07:00
vrc4173_cardu.c
vrc4173_cardu.h
yenta_socket.c pcmcia: use dev_printk and dev_dbg in yenta_socket 2008-08-23 01:49:44 +02:00
yenta_socket.h