savagefb: Make savagefb one module
PATCH 9/10 savagefb: Make savagefb one module
#if defined(CONFIG_FB_SAVAGE_ACCEL)
doesn't work with FB_SAVAGE_ACCEL=m, and
#if defined(CONFIG_FB_SAVAGE_ACCEL) || defined(CONFIG_FB_SAVAGE_ACCEL_MODULE)
would break with FB_SAVAGE=y and FB_SAVAGE_ACCEL=m.
Rename savagefb.c to savagefb_driver.c.
Signed-off-by Adrian Bunk <[email protected]>
Signed-off-by Antonino Daplas <[email protected]>
---
b/drivers/video/Kconfig | 4 b/drivers/video/savage/Makefile | 7 b/drivers/video/savage/savagefb-i2c.c | 3 b/drivers/video/savage/savagefb_accel.c | 4 b/drivers/video/savage/savagefb_driver.c | 2280 +++++++++++++++++++++++++++++++ drivers/video/savage/savagefb.c | 2280 ------------------------------- 6 files changed, 2286 insertions(+), 2292 deletions(-)
drivers/video/Kconfig +2 -2
@@ -1023,7 +1023,7 @@ will be called savagefb. config FB_SAVAGE_I2C - tristate "Enable DDC2 Support" + bool "Enable DDC2 Support" depends on FB_SAVAGE help This enables I2C support for S3 Savage Chipsets. This is used
@@ -1035,7 +1035,7 @@ here. config FB_SAVAGE_ACCEL - tristate "Enable Console Acceleration" + bool "Enable Console Acceleration" depends on FB_SAVAGE default n help
drivers/video/savage/Makefile +4 -3
@@ -2,7 +2,8 @@ # Makefile for the S3 Savage framebuffer driver # -obj-$(CONFIG_FB_SAVAGE) += savagefb.o -obj-$(CONFIG_FB_SAVAGE_I2C) += savagefb-i2c.o -obj-$(CONFIG_FB_SAVAGE_ACCEL) += savagefb_accel.o +obj-$(CONFIG_FB_SAVAGE) += savagefb.o +savagefb-y += savagefb_driver.o +savagefb-$(CONFIG_FB_SAVAGE_I2C) += savagefb-i2c.o +savagefb-$(CONFIG_FB_SAVAGE_ACCEL) += savagefb_accel.o
drivers/video/savage/savagefb-i2c.c +0 -3
@@ -207,7 +207,6 @@savage_setup_i2c_bus (&par->chan,"SAVAGE DDC2" ); } -EXPORT_SYMBOL (savagefb_create_i2c_busses);void savagefb_delete_i2c_busses (struct fb_info *info) {
@@ -222,7 +221,6 @@ par->chan.par =NULL ; } -EXPORT_SYMBOL (savagefb_delete_i2c_busses);static u8 *savage_do_probe_i2c_edid (struct savagefb_i2c_chan *chan) {
@@ -280,6 +278,5 @@return 0 ; } -EXPORT_SYMBOL (savagefb_probe_i2c_connector);MODULE_LICENSE ("GPL" );
drivers/video/savage/savagefb.c deleted +0 -2280
2,280 lines not on this page · raw message
drivers/video/savage/savagefb_accel.c +0 -4
@@ -26,7 +26,6 @@ par->SavageWaitIdle (par);return 0 ; } -EXPORT_SYMBOL (savagefb_sync);void savagefb_copyarea (struct fb_info *info,const struct fb_copyarea *region) {
@@ -61,7 +60,6 @@BCI_SEND (BCI_X_Y (dx, dy));BCI_SEND (BCI_W_H (region->width, region->height)); } -EXPORT_SYMBOL (savagefb_copyarea);void savagefb_fillrect (struct fb_info *info,const struct fb_fillrect *rect) {
@@ -89,7 +87,6 @@BCI_SEND (BCI_X_Y (rect->dx, rect->dy) );BCI_SEND (BCI_W_H (rect->width, rect->height) ); } -EXPORT_SYMBOL (savagefb_fillrect);void savagefb_imageblit (struct fb_info *info,const struct fb_image *image) {
@@ -135,6 +132,5 @@for (i =0 ; i < size; i++)BCI_SEND (src[i]); } -EXPORT_SYMBOL (savagefb_imageblit);MODULE_LICENSE ("GPL" );
drivers/video/savage/savagefb_driver.c new file +2280 -0
646 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
Part of the diff is not shown here. View the raw message.