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
[XFS] Fix merge failures
[pandora-kernel.git]
/
drivers
/
net
/
cs89x0.c
diff --git
a/drivers/net/cs89x0.c
b/drivers/net/cs89x0.c
index
b063395
..
d548a45
100644
(file)
--- a/
drivers/net/cs89x0.c
+++ b/
drivers/net/cs89x0.c
@@
-1030,7
+1030,7
@@
skip_this_frame:
#endif /* ALLOW_DMA */
-
void
__init reset_chip(struct net_device *dev)
+
static void
__init reset_chip(struct net_device *dev)
{
#if !defined(CONFIG_MACH_MX31ADS)
#if !defined(CONFIG_MACH_IXDP2351) && !defined(CONFIG_ARCH_IXDP2X01)