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

[mv-sheeva.git] / drivers / net / can / sja1000 / plx_pci.c

diff --git a/drivers/net/can/sja1000/plx_pci.c b/drivers/net/can/sja1000/plx_pci.c
index 437b5c716a2426aeac6157808b0539976db0515a..231385b8e08faa38bfab0850080109d256cf6c2d 100644 (file)
--- a/drivers/net/can/sja1000/plx_pci.c
+++ b/drivers/net/can/sja1000/plx_pci.c
@@ -383,7 +383,7 @@ static void plx_pci_reset_marathon(struct pci_dev *pdev)
 {
        void __iomem *reset_addr;
        int i;
-       int reset_bar[2] = {3, 5};
+       static const int reset_bar[2] = {3, 5};
 
        plx_pci_reset_common(pdev);