linux-2.6-savagefb.patch

   1 diff -Nru a/drivers/video/Kconfig b/drivers/video/Kconfig
   2 --- a/drivers/video/Kconfig     2004-10-22 16:37:37 +08:00
   3 +++ b/drivers/video/Kconfig     2004-10-26 21:53:01 +08:00
   4 @@ -811,7 +811,7 @@
   5           will be called savagefb.
   6
   7  config FB_SAVAGE_I2C
   8 -       bool "Enable DDC2 Support"
   9 +       tristate "Enable DDC2 Support"
  10         depends on FB_SAVAGE
  11         help
  12           This enables I2C support for S3 Savage Chipsets.  This is used
  13 @@ -823,7 +823,7 @@
  14           here.
  15
  16  config FB_SAVAGE_ACCEL
  17 -       bool "Enable Console Acceleration"
  18 +       tristate "Enable Console Acceleration"
  19         depends on FB_SAVAGE
  20         default n
  21         help
  22 diff -Nru a/drivers/video/savage/savagefb-i2c.c b/drivers/video/savage/savagefb-i2c.c
  23 --- a/drivers/video/savage/savagefb-i2c.c       2004-10-22 16:37:37 +08:00
  24 +++ b/drivers/video/savage/savagefb-i2c.c       2004-10-26 21:53:01 +08:00
  25 @@ -197,6 +197,7 @@
  26
  27         savage_setup_i2c_bus(&par->chan, "SAVAGE DDC2");
  28  }
  29 +EXPORT_SYMBOL(savagefb_create_i2c_busses);
  30
  31  void savagefb_delete_i2c_busses(struct fb_info *info)
  32  {
  33 @@ -206,6 +207,7 @@
  34                 i2c_bit_del_bus(&par->chan.adapter);
  35         par->chan.par = NULL;
  36  }
  37 +EXPORT_SYMBOL(savagefb_delete_i2c_busses);
  38
  39  static u8 *savage_do_probe_i2c_edid(struct savagefb_i2c_chan *chan)
  40  {
  41 @@ -255,3 +257,6 @@
  42
  43         return 0;
  44  }
  45 +EXPORT_SYMBOL(savagefb_probe_i2c_connector);
  46 +
  47 +MODULE_LICENSE("GPL");
  48 diff -Nru a/drivers/video/savage/savagefb_accel.c b/drivers/video/savage/savagefb_accel.c
  49 --- a/drivers/video/savage/savagefb_accel.c     2004-10-22 16:37:38 +08:00
  50 +++ b/drivers/video/savage/savagefb_accel.c     2004-10-26 21:53:01 +08:00
  51 @@ -26,6 +26,7 @@
  52         par->SavageWaitIdle(par);
  53         return 0;
  54  }
  55 +EXPORT_SYMBOL(savagefb_sync);
  56
  57  void savagefb_copyarea(struct fb_info *info, const struct fb_copyarea *region)
  58  {
  59 @@ -60,6 +61,7 @@
  60         BCI_SEND(BCI_X_Y(dx, dy));
  61         BCI_SEND(BCI_W_H(region->width, region->height));
  62  }
  63 +EXPORT_SYMBOL(savagefb_copyarea);
  64
  65  void savagefb_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
  66  {
  67 @@ -87,6 +89,7 @@
  68         BCI_SEND( BCI_X_Y(rect->dx, rect->dy) );
  69         BCI_SEND( BCI_W_H(rect->width, rect->height) );
  70  }
  71 +EXPORT_SYMBOL(savagefb_fillrect);
  72
  73  void savagefb_imageblit(struct fb_info *info, const struct fb_image *image)
  74  {
  75 @@ -132,4 +135,6 @@
  76         for (i = 0; i < size; i++)
  77                 BCI_SEND(src[i]);
  78  }
  79 +EXPORT_SYMBOL(savagefb_imageblit);
  80
  81 +MODULE_LICENSE("GPL");
  82 diff -Nru a/drivers/video/savage/savagefb.c b/drivers/video/savage/savagefb.c
  83 --- a/drivers/video/savage/savagefb.c   2004-10-23 22:48:12 +08:00
  84 +++ b/drivers/video/savage/savagefb.c   2004-10-25 17:01:45 +08:00
  85 @@ -2468,9 +2468,9 @@
  86
  87  /* ************************* init in-kernel code ************************** */
  88
  89 -#ifndef MODULE
  90  int __init savagefb_setup(char *options)
  91  {
  92 +#ifndef MODULE
  93         char *this_opt;
  94
  95         if (!options || !*options)
  96 @@ -2483,10 +2483,9 @@
  97                         mode_option = this_opt;
  98                 }
  99         }
 100 -
 101 +#endif /* !MODULE */
 102         return 0;
 103  }
 104 -#endif /* !MODULE */
 105
 106  int __init savagefb_init(void)
 107  {
 108 diff -Nru a/drivers/video/savage/savagefb.h b/drivers/video/savage/savagefb.h
 109 --- a/drivers/video/savage/savagefb.h   2004-10-23 22:48:13 +08:00
 110 +++ b/drivers/video/savage/savagefb.h   2004-10-25 16:59:51 +08:00
 111 @@ -21,7 +21,7 @@
 112  # define DBG(x)                printk (KERN_DEBUG "savagefb: %s\n", (x));
 113  #else
 114  # define DBG(x)
 115 -# define SavagePrintRegs(x)
 116 +# define SavagePrintRegs(...)
 117  #endif
 118
 119