--- - branch: MAIN date: Wed Mar 10 21:00:36 UTC 2010 files: - new: '1.51' old: '1.50' path: src/sys/dev/cardbus/if_ex_cardbus.c pathrev: src/sys/dev/cardbus/if_ex_cardbus.c@1.51 type: modified id: 20100310T210036Z.aa4ca22da8bc5f6e0c8b3368b4f3150e9c10fdcf log: | This is *always* compiled with #define rbus 1, so get rid of the conditional compilation. Simplify interrupt (dis)establishment by two source transformations: - cardbus_intr_disestablish(cc, cf, ih); + Cardbus_intr_disestablish(ct, ih); - ih = cardbus_intr_establish(cc, cf, ...); + ih = Cardbus_intr_establish(ct, ...); Tested by me. module: src subject: 'CVS commit: src/sys/dev/cardbus' unixtime: '1268254836' user: dyoung