diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-23 02:00:44 +0200 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-08-23 02:00:44 +0200 |
| commit | ff08705860f3e92ea5233989b4a2384ebb421f26 (patch) | |
| tree | 6373a7bcfdfab16d85587b256dd4591f21b62e37 /drivers/pcmcia/pcmcia_ioctl.c | |
| parent | 795659ef0ee175d47723f806e7a29427b171e61b (diff) | |
| parent | ad913c11928f51abb6174f165db8d8d205b22e21 (diff) | |
| parent | 7d16b658bd093e75a9f72a69e2dafd2b154c4395 (diff) | |
| download | linux-next-ff08705860f3e92ea5233989b4a2384ebb421f26.tar.gz | |
Merge branches 'pcmcia-config-loop' and 'pcmcia-printk' into pcmcia
* pcmcia-config-loop:
pcmcia: pcmcia_config_loop() improvement by passing vcc
pcmcia: pcmcia_config_loop() default CIS entry handling
pcmcia: pcmcia_config_loop() ConfigIndex unification
pcmcia: use pcmcia_loop_config in misc pcmcia drivers
pcmcia: use pcmcia_loop_config in net pcmcia drivers
pcmcia: use pcmcia_loop_config in ISDN pcmcia drivers
pcmcia: use pcmcia_loop_config in scsi pcmcia drivers
pcmcia: use pcmcia_loop_config in bluetooth drivers
pcmcia: use pcmcia_loop_config in pata and ide drivers
pcmcia: add pcmcia_loop_config() helper
* pcmcia-printk:
pcmcia: don't add extra DEBUG cflag
pcmcia: remove unused cs_socket_name() definition
pcmcia: use dev_printk in module rsrc_nonstatic
pcmcia: use dev_printk in module pcmcia
pcmcia: use dev_printk in module pcmcia_core
pcmcia: use dev_printk and dev_dbg in yenta_socket