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