diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2006-12-06 23:38:35 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:40 -0500 |
commit | da015a6744f3648d34b83d1c4e015e6a798b8c56 (patch) | |
tree | 574d4904959d93e7c7c9d8f62942ae852f02a707 | |
parent | 4438982f56b7e2ecb7932612601ba0390972ce3b (diff) |
[PATCH] agp-amd64: section mismatches with HOTPLUG=n
When CONFIG_HOTPLUG=n, agp_amd64_resume() calls nforce3_agp_init(), which is
__devinit == __init, so has been discarded and is not usable for resume.
WARNING: drivers/char/agp/amd64-agp.o - Section mismatch: reference to .init.text: from .text between 'agp_amd64_resume' (at offset 0x249) and 'amd64_tlbflush'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/char/agp/amd64-agp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index 00b17ae39736..2f2c4efff8a3 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/drivers/char/agp/amd64-agp.c | |||
@@ -459,7 +459,7 @@ static const struct aper_size_info_32 nforce3_sizes[5] = | |||
459 | 459 | ||
460 | /* Handle shadow device of the Nvidia NForce3 */ | 460 | /* Handle shadow device of the Nvidia NForce3 */ |
461 | /* CHECK-ME original 2.4 version set up some IORRs. Check if that is needed. */ | 461 | /* CHECK-ME original 2.4 version set up some IORRs. Check if that is needed. */ |
462 | static int __devinit nforce3_agp_init(struct pci_dev *pdev) | 462 | static int nforce3_agp_init(struct pci_dev *pdev) |
463 | { | 463 | { |
464 | u32 tmp, apbase, apbar, aplimit; | 464 | u32 tmp, apbase, apbar, aplimit; |
465 | struct pci_dev *dev1; | 465 | struct pci_dev *dev1; |