Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[karo-tx-linux.git] / drivers / video / sgivwfb.c

diff --git a/drivers/video/sgivwfb.c b/drivers/video/sgivwfb.c
index f86012239bff25c232368778886246a3d423cccf..7a3a5e28eca13411f74022a8326d0f581a5194d2 100644 (file)
--- a/drivers/video/sgivwfb.c
+++ b/drivers/video/sgivwfb.c
@@ -745,7 +745,7 @@ int __init sgivwfb_setup(char *options)
 /*
  *  Initialisation
  */
-static int __init sgivwfb_probe(struct platform_device *dev)
+static int __devinit sgivwfb_probe(struct platform_device *dev)
 {
        struct sgivw_par *par;
        struct fb_info *info;