Linus, please do a bk pull bk://kernel.bkbits.net/jgarzik/exitp-2.5 This will update the following files: drivers/net/tulip/de2104x.c | 3 +-- include/linux/init.h | 13 ++++++++++++- 2 files changed, 13 insertions(+), 3 deletions(-) through these ChangeSets: (02/12/02 1.797.1.172) Add __exit_p() to match existing __devexit_p(). This patch fixes de2104x net driver up by doing the following things: (1) add __exit_p() to (2) add the unused attributed to __exit routines for non-modules (3) use __exit_p() to refer to de_remove_one()