]> err.no Git - linux-2.6/commit
[ATM] he: Fix __init/__devinit conflict
authorRoland Dreier <roland@digitalvampire.org>
Mon, 25 Sep 2006 03:09:33 +0000 (20:09 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 Sep 2006 03:09:33 +0000 (20:09 -0700)
commit5b7c714ec27584b18279b741b6043016f8adb9de
tree29b9599aecd0ebda24da4791abbc82a402fa081a
parent76a081e5b32fde17f6f6d007e1806744cc848712
[ATM] he: Fix __init/__devinit conflict

he_init_one() is declared __devinit, but calls lots of init functions
that are marked __init.  However, if CONFIG_HOTPLUG is enabled,
__devinit functions go into normal .text, which leads to

    WARNING: drivers/atm/he.o - Section mismatch: reference to .init.text: from .text between 'he_start' (at offset 0x2130) and 'he_service_tbrq'

Fix this by changing the __init functions to __devinit.

Signed-off-by: Roland Dreier <roland@digitalvampire.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/atm/he.c