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.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
include
/
linux
/
netdevice.h
diff --git
a/include/linux/netdevice.h
b/include/linux/netdevice.h
index
ca333e7
..
54b8b4d
100644
(file)
--- a/
include/linux/netdevice.h
+++ b/
include/linux/netdevice.h
@@
-2555,7
+2555,7
@@
extern void netdev_class_remove_file(struct class_attribute *class_attr);
extern struct kobj_ns_type_operations net_ns_type_operations;
extern struct kobj_ns_type_operations net_ns_type_operations;
-extern c
har *netdev_drivername(const struct net_device *dev, char *buffer, int len
);
+extern c
onst char *netdev_drivername(const struct net_device *dev
);
extern void linkwatch_run_queue(void);
extern void linkwatch_run_queue(void);