Merge branch '20101221_static_const' of git://repo.or.cz/linux-2.6/trivial-mods

2026-09-28 19:20:30 +00:00 · 2010-12-21 13:26:15 -08:00 · 2010-12-21 13:26:15 -08:00 · 503b1a529a
commit 503b1a529a
parent 4b4f546708 215faf9c5f
41 changed files with 199 additions and 177 deletions
--- a/drivers/net/3c501.c
+++ b/drivers/net/3c501.c
--- a/drivers/net/3c503.c
+++ b/drivers/net/3c503.c
--- a/drivers/net/3c507.c
+++ b/drivers/net/3c507.c
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
--- a/drivers/net/benet/be_ethtool.c
+++ b/drivers/net/benet/be_ethtool.c
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
--- a/drivers/net/bnx2x/bnx2x_main.c
+++ b/drivers/net/bnx2x/bnx2x_main.c
--- a/drivers/net/can/sja1000/plx_pci.c
+++ b/drivers/net/can/sja1000/plx_pci.c
--- a/drivers/net/chelsio/sge.c
+++ b/drivers/net/chelsio/sge.c
--- a/drivers/net/cxgb3/ael1002.c
+++ b/drivers/net/cxgb3/ael1002.c
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
--- a/drivers/net/cxgb4vf/t4vf_hw.c
+++ b/drivers/net/cxgb4vf/t4vf_hw.c
--- a/drivers/net/e2100.c
+++ b/drivers/net/e2100.c
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
--- a/drivers/net/eexpress.c
+++ b/drivers/net/eexpress.c
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
--- a/drivers/net/hp.c
+++ b/drivers/net/hp.c
--- a/drivers/net/irda/act200l-sir.c
+++ b/drivers/net/irda/act200l-sir.c
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
--- a/drivers/net/ksz884x.c
+++ b/drivers/net/ksz884x.c
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
--- a/drivers/net/ni52.c
+++ b/drivers/net/ni52.c
--- a/drivers/net/ni65.c
+++ b/drivers/net/ni65.c
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
--- a/drivers/net/qlcnic/qlcnic_hw.c
+++ b/drivers/net/qlcnic/qlcnic_hw.c
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
--- a/drivers/net/skfp/smt.c
+++ b/drivers/net/skfp/smt.c
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
--- a/drivers/net/smc-ultra.c
+++ b/drivers/net/smc-ultra.c
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
--- a/drivers/net/tokenring/ibmtr.c
+++ b/drivers/net/tokenring/ibmtr.c
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
--- a/drivers/net/vmxnet3/vmxnet3_drv.c
+++ b/drivers/net/vmxnet3/vmxnet3_drv.c
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
--- a/drivers/net/wd.c
+++ b/drivers/net/wd.c