Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 105563
b: refs/heads/master
c: 5798712
h: refs/heads/master
i:
  105561: b146ba8
  105559: 889dca9
v: v3
  • Loading branch information
Adrian Bunk authored and Linus Torvalds committed Jul 24, 2008
1 parent 888a626 commit 04c1257
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 104b198dd0b3b62a4fc4e9146f01f2abc718e926
refs/heads/master: 5798712d608f5ebad994487748a2ccf3cc613d78
17 changes: 7 additions & 10 deletions trunk/drivers/video/amifb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1136,7 +1136,6 @@ static int amifb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg
* Interface to the low level console driver
*/

int amifb_init(void);
static void amifb_deinit(void);

/*
Expand Down Expand Up @@ -2248,7 +2247,7 @@ static inline void chipfree(void)
* Initialisation
*/

int __init amifb_init(void)
static int __init amifb_init(void)
{
int tag, i, err = 0;
u_long chipptr;
Expand Down Expand Up @@ -3793,16 +3792,14 @@ static void ami_rebuild_copper(void)
}
}


module_init(amifb_init);

#ifdef MODULE
MODULE_LICENSE("GPL");

void cleanup_module(void)
static void __exit amifb_exit(void)
{
unregister_framebuffer(&fb_info);
amifb_deinit();
amifb_video_off();
}
#endif /* MODULE */

module_init(amifb_init);
module_exit(amifb_exit);

MODULE_LICENSE("GPL");

0 comments on commit 04c1257

Please sign in to comment.