From: Adrian Bunk <bunk@stusta.de>

- no need to hide MODULE_LICENSE() behind an #ifdef
- use module_{init,exit}; this also fixes the bug that bt866_init()
  was never called

(akpm: removed the emacs stuff too)

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Cc: Martin Samuelsson <sam@home.se>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/media/video/bt866.c |   22 ++++------------------
 1 files changed, 4 insertions(+), 18 deletions(-)

diff -puN drivers/media/video/bt866.c~drivers-media-video-bt866c-small-fixes-2 drivers/media/video/bt866.c
--- devel/drivers/media/video/bt866.c~drivers-media-video-bt866c-small-fixes-2	2006-04-05 02:20:36.000000000 -0700
+++ devel-akpm/drivers/media/video/bt866.c	2006-04-05 02:20:36.000000000 -0700
@@ -52,9 +52,7 @@
 
 #include <linux/video_encoder.h>
 
-#ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
-#endif
 
 #define	BT866_DEVNAME	"bt866"
 #define I2C_BT866	0x88
@@ -365,28 +363,16 @@ static int bt866_command(struct i2c_clie
 	return bt866_do_command(encoder, cmd, arg);
 }
 
-#ifdef MODULE
-int init_module(void)
-#else
-int bt866_init(void)
-#endif
+static int __devinit bt866_init(void)
 {
 	i2c_add_driver(&i2c_driver_bt866);
 	return 0;
 }
 
-#ifdef MODULE
-void cleanup_module(void)
+static void __devexit bt866_exit(void)
 {
 	i2c_del_driver(&i2c_driver_bt866);
 }
-#endif
 
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-basic-offset: 8
- * compile-command: "cd ../../.. && make modules SUBDIRS=drivers/media/video"
- * End:
- */
+module_init(bt866_init);
+module_exit(bt866_exit);
_