Skip to content

L
linux
Commit 617d212b authored by Jeff Garzik's avatar Jeff Garzik
Browse files
Options

Merge pobox.com:/garz/repo/netdev-2.6/initdata-fixes 

into pobox.com:/garz/repo/net-drivers-2.6
parents 0ba34de2 333cefe7
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/net/tulip/de2104x.c
View file @ 617d212b
...@@ -1927,7 +1927,7 @@ static void __init de21041_get_srom_info (struct de_private *de) ...@@ -1927,7 +1927,7 @@ static void __init de21041_get_srom_info (struct de_private *de)
goto fill_defaults; goto fill_defaults;
} }
static int __devinit de_init_one (struct pci_dev *pdev, static int __init de_init_one (struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
struct net_device *dev; struct net_device *dev;
......
drivers/net/wan/sbni.c
View file @ 617d212b
...@@ -176,7 +176,7 @@ static u32 mac[ SBNI_MAX_NUM_CARDS ] __initdata; ...@@ -176,7 +176,7 @@ static u32 mac[ SBNI_MAX_NUM_CARDS ] __initdata;
#ifndef MODULE #ifndef MODULE
typedef u32 iarr[]; typedef u32 iarr[];
static iarr *dest[5] = { &io, &irq, &baud, &rxl, &mac }; static iarr __initdata *dest[5] = { &io, &irq, &baud, &rxl, &mac };
#endif #endif
/* A zero-terminated list of I/O addresses to be probed on ISA bus */ /* A zero-terminated list of I/O addresses to be probed on ISA bus */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7