From: "Antonino A. Daplas" Fix link error for PPC-based drivers that also use functions in macmodes.c. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton --- 25-akpm/drivers/video/Kconfig | 16 ++++++++++++++++ 25-akpm/drivers/video/Makefile | 9 +++++---- 25-akpm/drivers/video/macmodes.c | 9 ++++++--- 3 files changed, 27 insertions(+), 7 deletions(-) diff -puN drivers/video/Kconfig~fbdev-kconfig-fix-for-macmodes-and-ppc drivers/video/Kconfig --- 25/drivers/video/Kconfig~fbdev-kconfig-fix-for-macmodes-and-ppc Mon Mar 14 15:30:14 2005 +++ 25-akpm/drivers/video/Kconfig Mon Mar 14 15:30:14 2005 @@ -74,6 +74,11 @@ config FB_SOFT_CURSOR This is used by drivers that don't provide their own (accelerated) version. +config FB_MACMODES + tristate + depends on FB + default n + config FB_MODE_HELPERS bool "Enable Video Mode Handling Helpers" depends on FB @@ -323,6 +328,7 @@ config FB_OF select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select FB_SOFT_CURSOR + select FB_MACMODES help Say Y if you want support with Open Firmware for your graphics board. @@ -334,6 +340,7 @@ config FB_CONTROL select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select FB_SOFT_CURSOR + select FB_MACMODES help This driver supports a frame buffer for the graphics adapter in the Power Macintosh 7300 and others. @@ -345,6 +352,7 @@ config FB_PLATINUM select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select FB_SOFT_CURSOR + select FB_MACMODES help This driver supports a frame buffer for the "platinum" graphics adapter in some Power Macintoshes. @@ -356,6 +364,7 @@ config FB_VALKYRIE select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select FB_SOFT_CURSOR + select FB_MACMODES help This driver supports a frame buffer for the "valkyrie" graphics adapter in some Power Macintoshes. @@ -384,6 +393,7 @@ config FB_IMSTT depends on (FB = y) && PCI select FB_CFB_IMAGEBLIT select FB_SOFT_CURSOR + select FB_MACMODES if PPC help The IMS Twin Turbo is a PCI-based frame buffer card bundled with many Macintosh and compatible computers. @@ -436,6 +446,7 @@ config FB_MAC select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select FB_SOFT_CURSOR + select FB_MACMODES # bool ' Apple DAFB display support' CONFIG_FB_DAFB config FB_HP300 @@ -753,6 +764,7 @@ config FB_MATROX select FB_CFB_IMAGEBLIT select FB_SOFT_CURSOR select FB_TILEBLITTING + select FB_MACMODES if PPC_PMAC ---help--- Say Y here if you have a Matrox Millennium, Matrox Millennium II, Matrox Mystique, Matrox Mystique 220, Matrox Productiva G100, Matrox @@ -892,6 +904,7 @@ config FB_RADEON_OLD select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select FB_SOFT_CURSOR + select FB_MACMODES if PPC help Choose this option if you want to use an ATI Radeon graphics card as a framebuffer device. There are both PCI and AGP versions. You @@ -909,6 +922,7 @@ config FB_RADEON select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select FB_SOFT_CURSOR + select FB_MACMODES if PPC_OF help Choose this option if you want to use an ATI Radeon graphics card as a framebuffer device. There are both PCI and AGP versions. You @@ -947,6 +961,7 @@ config FB_ATY128 select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select FB_SOFT_CURSOR + select FB_MACMODES if PPC_PMAC help This driver supports graphics boards with the ATI Rage128 chips. Say Y if you have such a graphics board and read @@ -962,6 +977,7 @@ config FB_ATY select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select FB_SOFT_CURSOR + select FB_MACMODES if PPC help This driver supports graphics boards with the ATI Mach64 chips. Say Y if you have such a graphics board. diff -puN drivers/video/macmodes.c~fbdev-kconfig-fix-for-macmodes-and-ppc drivers/video/macmodes.c --- 25/drivers/video/macmodes.c~fbdev-kconfig-fix-for-macmodes-and-ppc Mon Mar 14 15:30:14 2005 +++ 25-akpm/drivers/video/macmodes.c Mon Mar 14 15:30:14 2005 @@ -19,6 +19,7 @@ #include #include #include +#include #include "macmodes.h" @@ -281,7 +282,7 @@ int mac_vmode_to_var(int vmode, int cmod var->vmode = mode->vmode; return 0; } - +EXPORT_SYMBOL(mac_vmode_to_var); /** * mac_var_to_vmode - convert var structure to MacOS vmode/cmode pair @@ -326,7 +327,7 @@ int mac_var_to_vmode(const struct fb_var } return -EINVAL; } - +EXPORT_SYMBOL(mac_var_to_vmode); /** * mac_map_monitor_sense - Convert monitor sense to vmode @@ -348,7 +349,7 @@ int mac_map_monitor_sense(int sense) break; return map->vmode; } - +EXPORT_SYMBOL(mac_map_monitor_sense); /** * mac_find_mode - find a video mode @@ -384,3 +385,5 @@ int __init mac_find_mode(struct fb_var_s return fb_find_mode(var, info, mode_option, db, dbsize, &mac_modedb[DEFAULT_MODEDB_INDEX], default_bpp); } +EXPORT_SYMBOL(mac_find_mode); + diff -puN drivers/video/Makefile~fbdev-kconfig-fix-for-macmodes-and-ppc drivers/video/Makefile --- 25/drivers/video/Makefile~fbdev-kconfig-fix-for-macmodes-and-ppc Mon Mar 14 15:30:14 2005 +++ 25-akpm/drivers/video/Makefile Mon Mar 14 15:30:14 2005 @@ -16,6 +16,7 @@ obj-$(CONFIG_FB_CFB_FILLRECT) += cfbfil obj-$(CONFIG_FB_CFB_COPYAREA) += cfbcopyarea.o obj-$(CONFIG_FB_CFB_IMAGEBLIT) += cfbimgblt.o obj-$(CONFIG_FB_SOFT_CURSOR) += softcursor.o +obj-$(CONFIG_FB_MACMODES) += macmodes.o # Hardware specific drivers go first obj-$(CONFIG_FB_RETINAZ3) += retz3fb.o @@ -41,9 +42,9 @@ obj-$(CONFIG_FB_RADEON_OLD) += radeonf obj-$(CONFIG_FB_NEOMAGIC) += neofb.o vgastate.o obj-$(CONFIG_FB_VIRGE) += virgefb.o obj-$(CONFIG_FB_3DFX) += tdfxfb.o -obj-$(CONFIG_FB_CONTROL) += controlfb.o macmodes.o -obj-$(CONFIG_FB_PLATINUM) += platinumfb.o macmodes.o -obj-$(CONFIG_FB_VALKYRIE) += valkyriefb.o macmodes.o +obj-$(CONFIG_FB_CONTROL) += controlfb.o +obj-$(CONFIG_FB_PLATINUM) += platinumfb.o +obj-$(CONFIG_FB_VALKYRIE) += valkyriefb.o obj-$(CONFIG_FB_CT65550) += chipsfb.o obj-$(CONFIG_FB_IMSTT) += imsttfb.o obj-$(CONFIG_FB_S3TRIO) += S3triofb.o @@ -61,7 +62,7 @@ obj-$(CONFIG_FB_LEO) += leo obj-$(CONFIG_FB_SGIVW) += sgivwfb.o obj-$(CONFIG_FB_ACORN) += acornfb.o obj-$(CONFIG_FB_ATARI) += atafb.o -obj-$(CONFIG_FB_MAC) += macfb.o macmodes.o +obj-$(CONFIG_FB_MAC) += macfb.o obj-$(CONFIG_FB_HGA) += hgafb.o obj-$(CONFIG_FB_IGA) += igafb.o obj-$(CONFIG_FB_APOLLO) += dnfb.o _