| Message ID | 1257630907.15927.445.camel@localhost |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Saturday 07 November 2009, Ben Hutchings wrote: > Signed-off-by: Ben Hutchings <ben@decadent.org.uk> > --- > drivers/net/spider_net.c | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c > index 90e663f..782910c 100644 > --- a/drivers/net/spider_net.c > +++ b/drivers/net/spider_net.c > @@ -57,6 +57,7 @@ MODULE_AUTHOR("Utz Bacher <utz.bacher@de.ibm.com> and > Jens Osterkamp " \ MODULE_DESCRIPTION("Spider Southbridge Gigabit Ethernet > driver"); MODULE_LICENSE("GPL"); > MODULE_VERSION(VERSION); > +MODULE_FIRMWARE(SPIDER_NET_FIRMWARE_NAME); > > static int rx_descriptors = SPIDER_NET_RX_DESCRIPTORS_DEFAULT; > static int tx_descriptors = SPIDER_NET_TX_DESCRIPTORS_DEFAULT; In spider_net, the filesystem is checked for a valid firmware first, if it does not exist, the firmware is taken from the device tree (which is the default case). Do you expect this behaviour to cause problems together with MODULE_FIRMWARE ?
From: Ben Hutchings <ben@decadent.org.uk> Date: Sat, 07 Nov 2009 21:55:07 +0000 > Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Applied to net-next-2.6 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Jens Osterkamp <jens@linux.vnet.ibm.com> Date: Mon, 9 Nov 2009 12:58:13 +0100 > In spider_net, the filesystem is checked for a valid firmware first, if it > does not exist, the firmware is taken from the device tree (which is the > default case). > > Do you expect this behaviour to cause problems together with MODULE_FIRMWARE ? I think it should be OK. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index 90e663f..782910c 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c @@ -57,6 +57,7 @@ MODULE_AUTHOR("Utz Bacher <utz.bacher@de.ibm.com> and Jens Osterkamp " \ MODULE_DESCRIPTION("Spider Southbridge Gigabit Ethernet driver"); MODULE_LICENSE("GPL"); MODULE_VERSION(VERSION); +MODULE_FIRMWARE(SPIDER_NET_FIRMWARE_NAME); static int rx_descriptors = SPIDER_NET_RX_DESCRIPTORS_DEFAULT; static int tx_descriptors = SPIDER_NET_TX_DESCRIPTORS_DEFAULT;
Signed-off-by: Ben Hutchings <ben@decadent.org.uk> --- drivers/net/spider_net.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)