mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
5429126351
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (29 commits)
pcmcia: disable PCMCIA ioctl also for ARM
drivers/staging/comedi: dev_node removal (quatech_daqp_cs)
drivers/staging/comedi: dev_node removal (ni_mio_cs)
drivers/staging/comedi: dev_node removal (ni_labpc_cs)
drivers/staging/comedi: dev_node removal (ni_daq_dio24)
drivers/staging/comedi: dev_node removal (ni_daq_700)
drivers/staging/comedi: dev_node removal (das08_cs)
drivers/staging/comedi: dev_node removal (cb_das16_cs)
pata_pcmcia: get rid of extra indirection
pcmcia: remove suspend-related comment from yenta_socket.c
pcmcia: call pcmcia_{read,write}_cis_mem with ops_mutex held
pcmcia: remove pcmcia_add_device_lock
pcmcia: update gfp/slab.h includes
pcmcia: remove unused mem_op.h
pcmcia: do not autoadd root PCI bus resources
pcmcia: clarify alloc_io_space, move it to resource handlers
pcmcia: move all pcmcia_resource_ops providers into one module
pcmcia: move high level CIS access code to separate file
pcmcia: dev_node removal (core)
pcmcia: dev_node removal (remaining drivers)
...
76 lines
3 KiB
Makefile
76 lines
3 KiB
Makefile
#
|
|
# Makefile for the kernel pcmcia subsystem (c/o David Hinds)
|
|
#
|
|
|
|
pcmcia_core-y += cs.o socket_sysfs.o
|
|
pcmcia_core-$(CONFIG_CARDBUS) += cardbus.o
|
|
obj-$(CONFIG_PCCARD) += pcmcia_core.o
|
|
|
|
pcmcia-y += ds.o pcmcia_resource.o cistpl.o pcmcia_cis.o
|
|
pcmcia-$(CONFIG_PCMCIA_IOCTL) += pcmcia_ioctl.o
|
|
obj-$(CONFIG_PCMCIA) += pcmcia.o
|
|
|
|
pcmcia_rsrc-y += rsrc_mgr.o
|
|
pcmcia_rsrc-$(CONFIG_PCCARD_NONSTATIC) += rsrc_nonstatic.o
|
|
pcmcia_rsrc-$(CONFIG_PCCARD_IODYN) += rsrc_iodyn.o
|
|
obj-$(CONFIG_PCCARD) += pcmcia_rsrc.o
|
|
|
|
|
|
# socket drivers
|
|
|
|
obj-$(CONFIG_YENTA) += yenta_socket.o
|
|
|
|
obj-$(CONFIG_PD6729) += pd6729.o
|
|
obj-$(CONFIG_I82365) += i82365.o
|
|
obj-$(CONFIG_I82092) += i82092.o
|
|
obj-$(CONFIG_TCIC) += tcic.o
|
|
obj-$(CONFIG_PCMCIA_M8XX) += m8xx_pcmcia.o
|
|
obj-$(CONFIG_PCMCIA_SOC_COMMON) += soc_common.o
|
|
obj-$(CONFIG_PCMCIA_SA1100) += sa11xx_base.o sa1100_cs.o
|
|
obj-$(CONFIG_PCMCIA_SA1111) += sa11xx_base.o sa1111_cs.o
|
|
obj-$(CONFIG_M32R_PCC) += m32r_pcc.o
|
|
obj-$(CONFIG_M32R_CFC) += m32r_cfc.o
|
|
obj-$(CONFIG_PCMCIA_AU1X00) += au1x00_ss.o
|
|
obj-$(CONFIG_PCMCIA_BCM63XX) += bcm63xx_pcmcia.o
|
|
obj-$(CONFIG_PCMCIA_VRC4171) += vrc4171_card.o
|
|
obj-$(CONFIG_PCMCIA_VRC4173) += vrc4173_cardu.o
|
|
obj-$(CONFIG_OMAP_CF) += omap_cf.o
|
|
obj-$(CONFIG_BFIN_CFPCMCIA) += bfin_cf_pcmcia.o
|
|
obj-$(CONFIG_AT91_CF) += at91_cf.o
|
|
obj-$(CONFIG_ELECTRA_CF) += electra_cf.o
|
|
obj-$(CONFIG_PCMCIA_ALCHEMY_DEVBOARD) += db1xxx_ss.o
|
|
|
|
au1x00_ss-y += au1000_generic.o
|
|
au1x00_ss-$(CONFIG_MIPS_PB1000) += au1000_pb1x00.o
|
|
|
|
sa1111_cs-y += sa1111_generic.o
|
|
sa1111_cs-$(CONFIG_ASSABET_NEPONSET) += sa1100_neponset.o
|
|
sa1111_cs-$(CONFIG_SA1100_BADGE4) += sa1100_badge4.o
|
|
sa1111_cs-$(CONFIG_SA1100_JORNADA720) += sa1100_jornada720.o
|
|
|
|
sa1100_cs-y += sa1100_generic.o
|
|
sa1100_cs-$(CONFIG_SA1100_ASSABET) += sa1100_assabet.o
|
|
sa1100_cs-$(CONFIG_SA1100_CERF) += sa1100_cerf.o
|
|
sa1100_cs-$(CONFIG_SA1100_COLLIE) += pxa2xx_sharpsl.o
|
|
sa1100_cs-$(CONFIG_SA1100_H3600) += sa1100_h3600.o
|
|
sa1100_cs-$(CONFIG_SA1100_SHANNON) += sa1100_shannon.o
|
|
sa1100_cs-$(CONFIG_SA1100_SIMPAD) += sa1100_simpad.o
|
|
|
|
pxa2xx_lubbock_cs-y += pxa2xx_lubbock.o sa1111_generic.o
|
|
pxa2xx_cm_x2xx_cs-y += pxa2xx_cm_x2xx.o pxa2xx_cm_x255.o pxa2xx_cm_x270.o
|
|
pxa2xx-obj-$(CONFIG_ARCH_LUBBOCK) += pxa2xx_lubbock_cs.o
|
|
pxa2xx-obj-$(CONFIG_MACH_MAINSTONE) += pxa2xx_mainstone.o
|
|
pxa2xx-obj-$(CONFIG_PXA_SHARPSL) += pxa2xx_sharpsl.o
|
|
pxa2xx-obj-$(CONFIG_MACH_ARMCORE) += pxa2xx_cm_x2xx_cs.o
|
|
pxa2xx-obj-$(CONFIG_ARCOM_PCMCIA) += pxa2xx_viper.o
|
|
pxa2xx-obj-$(CONFIG_TRIZEPS_PCMCIA) += pxa2xx_trizeps4.o
|
|
pxa2xx-obj-$(CONFIG_MACH_PALMTX) += pxa2xx_palmtx.o
|
|
pxa2xx-obj-$(CONFIG_MACH_PALMTC) += pxa2xx_palmtc.o
|
|
pxa2xx-obj-$(CONFIG_MACH_PALMLD) += pxa2xx_palmld.o
|
|
pxa2xx-obj-$(CONFIG_MACH_E740) += pxa2xx_e740.o
|
|
pxa2xx-obj-$(CONFIG_MACH_STARGATE2) += pxa2xx_stargate2.o
|
|
pxa2xx-obj-$(CONFIG_MACH_VPAC270) += pxa2xx_vpac270.o
|
|
|
|
obj-$(CONFIG_PCMCIA_PXA2XX) += pxa2xx_base.o $(pxa2xx-obj-y)
|
|
|
|
obj-$(CONFIG_PCMCIA_XXS1500) += xxs1500_ss.o
|