From: Alessandro Rubini <rubini@gnudd.com>
To: linux-kernel@vger.kernel.org, peppe.cavallaro@st.com,
netdev@vger.kernel.org
Cc: giancarlo.asnaghi@st.com
Subject: [PATCH 1/3] stmmac: added PCI identifiers
Date: Tue, 24 Jan 2012 10:08:56 +0100 [thread overview]
Message-ID: <e05c69415f05b3dbca26cd8255374de3656dcbff.1327394751.git.rubini@gnudd.com> (raw)
In-Reply-To: <cover.1327394750.git.rubini@gnudd.com>
STM has a device ID within its own VENDOR space, and it is being
used in the STA2X11 I/O Hub.
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
Acked-by: Giancarlo Asnaghi <giancarlo.asnaghi@st.com>
Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
index 54a819a..c796de9 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c
@@ -170,9 +170,9 @@ static int stmmac_pci_resume(struct pci_dev *pdev)
#define STMMAC_DEVICE_ID 0x1108
static DEFINE_PCI_DEVICE_TABLE(stmmac_id_table) = {
- {
- PCI_DEVICE(STMMAC_VENDOR_ID, STMMAC_DEVICE_ID)}, {
- }
+ {PCI_DEVICE(STMMAC_VENDOR_ID, STMMAC_DEVICE_ID)},
+ {PCI_DEVICE(PCI_VENDOR_ID_STMICRO, PCI_DEVICE_ID_STMICRO_MAC)},
+ {}
};
MODULE_DEVICE_TABLE(pci, stmmac_id_table);
--
1.7.7.2
next prev parent reply other threads:[~2012-01-24 9:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-24 9:08 [PATCH 0/3] stmmac patches Alessandro Rubini
2012-01-24 9:08 ` Alessandro Rubini [this message]
2012-01-24 9:09 ` [PATCH 2/3] stmmac: err out on second probe; use precompiled static structures Alessandro Rubini
2012-01-24 9:09 ` [PATCH 3/3] stmmac: remove kernel cmdline parsing Alessandro Rubini
2012-01-24 20:43 ` [PATCH 0/3] stmmac patches David Miller
2012-01-24 20:47 ` Alessandro Rubini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e05c69415f05b3dbca26cd8255374de3656dcbff.1327394751.git.rubini@gnudd.com \
--to=rubini@gnudd.com \
--cc=giancarlo.asnaghi@st.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=peppe.cavallaro@st.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®