Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
[linux-2.6] / drivers / scsi / pcmcia / fdomain_core.c
1 #define PCMCIA 1
2 #include "fdomain.c"