Merge with /home/shaggy/git/linus-clean/

[~andy/linux] / drivers / video / macmodes.c

diff --git a/drivers/video/macmodes.c b/drivers/video/macmodes.c
index de5a0f383600832ec8f216764827376b0e2f66d9..2fc71081f7e7077749ff659ec9176d0c7f75f6c1 100644 (file)
--- a/drivers/video/macmodes.c
+++ b/drivers/video/macmodes.c
@@ -387,3 +387,4 @@ int __init mac_find_mode(struct fb_var_screeninfo *var, struct fb_info *info,
 }
 EXPORT_SYMBOL(mac_find_mode);
 
+MODULE_LICENSE("GPL");