From: Chris Wright <chrisw@osdl.org>

Remove confusing error message when loading as secondary module, and ditch
conditional MY_NAME macro.