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 git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
drivers
/
net
/
appletalk
/
cops.c
diff --git
a/drivers/net/appletalk/cops.c
b/drivers/net/appletalk/cops.c
index
9edaa18
..
ae7f828
100644
(file)
--- a/
drivers/net/appletalk/cops.c
+++ b/
drivers/net/appletalk/cops.c
@@
-48,7
+48,6
@@
static const char *version =
* the driver figure it out.
*/
* the driver figure it out.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
@@
-1031,7
+1030,7
@@
module_param(io, int, 0);
module_param(irq, int, 0);
module_param(board_type, int, 0);
module_param(irq, int, 0);
module_param(board_type, int, 0);
-int init_module(void)
+int
__init
init_module(void)
{
if (io == 0)
printk(KERN_WARNING "%s: You shouldn't autoprobe with insmod\n",
{
if (io == 0)
printk(KERN_WARNING "%s: You shouldn't autoprobe with insmod\n",