summaryrefslogtreecommitdiffstats
path: root/drivers/net/irda/ma600-sir.c
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2008-12-31 19:56:05 +0100
committerPierre Ossman <drzeus@drzeus.cx>2008-12-31 19:56:05 +0100
commit418f19ea17a99421b22a64e101e14b6a16bed66d (patch)
tree7c21fcc368c63f1f9907deac6d16b30bd371792d /drivers/net/irda/ma600-sir.c
parentsdricoh_cs: Add support for Bay Controller devices (diff)
parentmmc: warn about voltage mismatches (diff)
downloadlinux-418f19ea17a99421b22a64e101e14b6a16bed66d.tar.xz
linux-418f19ea17a99421b22a64e101e14b6a16bed66d.zip
Merge branch 'master' of ../mmc
Diffstat (limited to 'drivers/net/irda/ma600-sir.c')
-rw-r--r--drivers/net/irda/ma600-sir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/irda/ma600-sir.c b/drivers/net/irda/ma600-sir.c
index 1ceed9cfb7c4..e91216452379 100644
--- a/drivers/net/irda/ma600-sir.c
+++ b/drivers/net/irda/ma600-sir.c
@@ -236,7 +236,7 @@ static int ma600_change_speed(struct sir_dev *dev, unsigned speed)
* avoid the state machine complexity before we get things working
*/
-int ma600_reset(struct sir_dev *dev)
+static int ma600_reset(struct sir_dev *dev)
{
IRDA_DEBUG(2, "%s()\n", __func__);