2be4ff2f08
* 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 |
||
---|---|---|
.. | ||
b43.h | ||
debugfs.c | ||
debugfs.h | ||
dma.c | ||
dma.h | ||
Kconfig | ||
leds.c | ||
leds.h | ||
lo.c | ||
lo.h | ||
main.c | ||
main.h | ||
Makefile | ||
pcmcia.c | ||
pcmcia.h | ||
phy_a.c | ||
phy_a.h | ||
phy_common.c | ||
phy_common.h | ||
phy_g.c | ||
phy_g.h | ||
phy_lp.c | ||
phy_lp.h | ||
phy_n.c | ||
phy_n.h | ||
pio.c | ||
pio.h | ||
rfkill.c | ||
rfkill.h | ||
sysfs.c | ||
sysfs.h | ||
tables_nphy.c | ||
tables_nphy.h | ||
tables.c | ||
tables.h | ||
wa.c | ||
wa.h | ||
xmit.c | ||
xmit.h |