Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / net / irda / act200l-sir.c

diff --git a/drivers/net/irda/act200l-sir.c b/drivers/net/irda/act200l-sir.c
index 37ab8c855719e0a3149c40ccc851ef8367e22df7..8ff084f1d23689590b0a6bcf7df8e16538b073ec 100644 (file)
--- a/drivers/net/irda/act200l-sir.c
+++ b/drivers/net/irda/act200l-sir.c
@@ -199,7 +199,7 @@ static int act200l_reset(struct sir_dev *dev)
 {
        unsigned state = dev->fsm.substate;
        unsigned delay = 0;
-       u8 control[9] = {
+       static const u8 control[9] = {
                ACT200L_REG15,
                ACT200L_REG13 | ACT200L_SHDW,
                ACT200L_REG21 | ACT200L_EXCK | ACT200L_OSCL,