git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight
[pandora-kernel.git]
/
drivers
/
video
/
riva
/
fbdev.c
diff --git
a/drivers/video/riva/fbdev.c
b/drivers/video/riva/fbdev.c
index
d251174
..
5c47968
100644
(file)
--- a/
drivers/video/riva/fbdev.c
+++ b/
drivers/video/riva/fbdev.c
@@
-2146,7
+2146,7
@@
static void __devexit rivafb_remove(struct pci_dev *pd)
* ------------------------------------------------------------------------- */
#ifndef MODULE
-static int __init rivafb_setup(char *options)
+static int __
dev
init rivafb_setup(char *options)
{
char *this_opt;