diff options
author | Olaf Hering <olh@suse.de> | 2006-07-30 06:03:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-31 16:28:41 -0400 |
commit | a04b61d3dc68857dcc81a5761268c96056742fb2 (patch) | |
tree | d153fe1763095038569790e1640fddb2d437903a | |
parent | cfa224e928f782e1593b5222688fad84c2cad3e8 (diff) |
[PATCH] hide onboard graphics drivers on G5
Hide the video drivers for onboard graphics found in early PCI PowerMacs in
Apple G5 config files.
drivers/built-in.o: In function `.platinumfb_probe':
platinumfb.c:(.text+0x377a0): undefined reference to `.nvram_read_byte'
platinumfb.c:(.text+0x37830): undefined reference to `.nvram_read_byte'
drivers/built-in.o: In function `.control_init':
controlfb.c:(.init.text+0x1938): undefined reference to `.nvram_read_byte'
controlfb.c:(.init.text+0x1968): undefined reference to `.nvram_read_byte'
drivers/built-in.o: In function `.valkyriefb_init':
(.init.text+0x2300): undefined reference to `.nvram_read_byte'
drivers/built-in.o:(.init.text+0x239c): more undefined references to `.nvram_read_byte' follow
Signed-off-by: Olaf Hering <olh@suse.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/video/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 6533b0f39231..82288a7218d4 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -420,7 +420,7 @@ config FB_OF | |||
420 | 420 | ||
421 | config FB_CONTROL | 421 | config FB_CONTROL |
422 | bool "Apple \"control\" display support" | 422 | bool "Apple \"control\" display support" |
423 | depends on (FB = y) && PPC_PMAC | 423 | depends on (FB = y) && PPC_PMAC && PPC32 |
424 | select FB_CFB_FILLRECT | 424 | select FB_CFB_FILLRECT |
425 | select FB_CFB_COPYAREA | 425 | select FB_CFB_COPYAREA |
426 | select FB_CFB_IMAGEBLIT | 426 | select FB_CFB_IMAGEBLIT |
@@ -431,7 +431,7 @@ config FB_CONTROL | |||
431 | 431 | ||
432 | config FB_PLATINUM | 432 | config FB_PLATINUM |
433 | bool "Apple \"platinum\" display support" | 433 | bool "Apple \"platinum\" display support" |
434 | depends on (FB = y) && PPC_PMAC | 434 | depends on (FB = y) && PPC_PMAC && PPC32 |
435 | select FB_CFB_FILLRECT | 435 | select FB_CFB_FILLRECT |
436 | select FB_CFB_COPYAREA | 436 | select FB_CFB_COPYAREA |
437 | select FB_CFB_IMAGEBLIT | 437 | select FB_CFB_IMAGEBLIT |
@@ -442,7 +442,7 @@ config FB_PLATINUM | |||
442 | 442 | ||
443 | config FB_VALKYRIE | 443 | config FB_VALKYRIE |
444 | bool "Apple \"valkyrie\" display support" | 444 | bool "Apple \"valkyrie\" display support" |
445 | depends on (FB = y) && (MAC || PPC_PMAC) | 445 | depends on (FB = y) && (MAC || (PPC_PMAC && PPC32)) |
446 | select FB_CFB_FILLRECT | 446 | select FB_CFB_FILLRECT |
447 | select FB_CFB_COPYAREA | 447 | select FB_CFB_COPYAREA |
448 | select FB_CFB_IMAGEBLIT | 448 | select FB_CFB_IMAGEBLIT |
@@ -453,7 +453,7 @@ config FB_VALKYRIE | |||
453 | 453 | ||
454 | config FB_CT65550 | 454 | config FB_CT65550 |
455 | bool "Chips 65550 display support" | 455 | bool "Chips 65550 display support" |
456 | depends on (FB = y) && PPC | 456 | depends on (FB = y) && PPC32 |
457 | select FB_CFB_FILLRECT | 457 | select FB_CFB_FILLRECT |
458 | select FB_CFB_COPYAREA | 458 | select FB_CFB_COPYAREA |
459 | select FB_CFB_IMAGEBLIT | 459 | select FB_CFB_IMAGEBLIT |