* [U-Boot-Users] [PATCH 1/2] Additional PCI IDs for IDE and network controllers
@ 2008-03-30 23:32 Guennadi Liakhovetski
2008-04-14 6:33 ` Wolfgang Denk
0 siblings, 1 reply; 4+ messages in thread
From: Guennadi Liakhovetski @ 2008-03-30 23:32 UTC (permalink / raw
To: u-boot
These PCI IDs are required by the Linkstation platforms.
Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
---
Sorry for a last minute submission... Woould be good to get this and the
following patch in for 1.3.3. Haven't found a PCI custodian, so, CC-ing
Wolfgang.
include/pci_ids.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/include/pci_ids.h b/include/pci_ids.h
index 3b10452..638d3d8 100644
--- a/include/pci_ids.h
+++ b/include/pci_ids.h
@@ -1472,6 +1472,8 @@
#define PCI_DEVICE_ID_ITE_IT8172G 0x8172
#define PCI_DEVICE_ID_ITE_IT8172G_AUDIO 0x0801
#define PCI_DEVICE_ID_ITE_IT8181 0x8181
+#define PCI_DEVICE_ID_ITE_8211 0x8211
+#define PCI_DEVICE_ID_ITE_8212 0x8212
#define PCI_DEVICE_ID_ITE_8872 0x8872
#define PCI_DEVICE_ID_ITE_IT8330G_0 0xe886
@@ -2073,3 +2075,5 @@
#define PCI_DEVICE_ID_MPC8641D 0x7011
#define PCI_DEVICE_ID_MPC8610 0x7018
+#define PCI_VENDOR_ID_ADMTEK 0x1317
+#define PCI_DEVICE_ID_ADMTEK_AN983B 0x985
--
1.5.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot-Users] [PATCH 1/2] Additional PCI IDs for IDE and network controllers
2008-03-30 23:32 [U-Boot-Users] [PATCH 1/2] Additional PCI IDs for IDE and network controllers Guennadi Liakhovetski
@ 2008-04-14 6:33 ` Wolfgang Denk
2008-04-15 8:24 ` [U-Boot-Users] [PATCH 1/2 v2] " Guennadi Liakhovetski
0 siblings, 1 reply; 4+ messages in thread
From: Wolfgang Denk @ 2008-04-14 6:33 UTC (permalink / raw
To: u-boot
In message <Pine.LNX.4.64.0803310104320.6825@axis700.grange> you wrote:
> These PCI IDs are required by the Linkstation platforms.
>
> Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
Sorry, does not apply - please rebase and resubmit:
Applying Additional PCI IDs for IDE and network controllers
error: patch failed: include/pci_ids.h:2073
error: include/pci_ids.h: patch does not apply
Using index info to reconstruct a base tree...
error: patch failed: include/pci_ids.h:2073
error: include/pci_ids.h: patch does not apply
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Cannot fall back to three-way merge.
Patch failed at 0001.
>
> Sorry for a last minute submission... Woould be good to get this and the
> following patch in for 1.3.3. Haven't found a PCI custodian, so, CC-ing
> Wolfgang.
No need to Cc: me. I read this list.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
It is common sense to take a method and try it. If it fails, admit it
frankly and try another. But above all, try something.
- Franklin D. Roosevelt
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot-Users] [PATCH 1/2 v2] Additional PCI IDs for IDE and network controllers
2008-04-14 6:33 ` Wolfgang Denk
@ 2008-04-15 8:24 ` Guennadi Liakhovetski
2008-04-18 4:14 ` Wolfgang Denk
0 siblings, 1 reply; 4+ messages in thread
From: Guennadi Liakhovetski @ 2008-04-15 8:24 UTC (permalink / raw
To: u-boot
These PCI IDs are required by the Linkstation platforms.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
diff --git a/include/pci_ids.h b/include/pci_ids.h
index 5481fff..61c2203 100644
--- a/include/pci_ids.h
+++ b/include/pci_ids.h
@@ -1472,6 +1472,8 @@
#define PCI_DEVICE_ID_ITE_IT8172G 0x8172
#define PCI_DEVICE_ID_ITE_IT8172G_AUDIO 0x0801
#define PCI_DEVICE_ID_ITE_IT8181 0x8181
+#define PCI_DEVICE_ID_ITE_8211 0x8211
+#define PCI_DEVICE_ID_ITE_8212 0x8212
#define PCI_DEVICE_ID_ITE_8872 0x8872
#define PCI_DEVICE_ID_ITE_IT8330G_0 0xe886
@@ -2073,3 +2075,6 @@
#define PCI_DEVICE_ID_MPC8641 0x7010
#define PCI_DEVICE_ID_MPC8641D 0x7011
#define PCI_DEVICE_ID_MPC8610 0x7018
+
+#define PCI_VENDOR_ID_ADMTEK 0x1317
+#define PCI_DEVICE_ID_ADMTEK_AN983B 0x0985
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot-Users] [PATCH 1/2 v2] Additional PCI IDs for IDE and network controllers
2008-04-15 8:24 ` [U-Boot-Users] [PATCH 1/2 v2] " Guennadi Liakhovetski
@ 2008-04-18 4:14 ` Wolfgang Denk
0 siblings, 0 replies; 4+ messages in thread
From: Wolfgang Denk @ 2008-04-18 4:14 UTC (permalink / raw
To: u-boot
In message <Pine.LNX.4.64.0804151021100.5159@axis700.grange> you wrote:
> These PCI IDs are required by the Linkstation platforms.
>
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
>
> ---
>
> diff --git a/include/pci_ids.h b/include/pci_ids.h
> index 5481fff..61c2203 100644
> --- a/include/pci_ids.h
> +++ b/include/pci_ids.h
Applied, thanks.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
The night sky over the planet Krikkit is the least interesting sight
in the entire Universe.
- Douglas Adams _Life, the Universe, and Everything_
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-04-18 4:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-30 23:32 [U-Boot-Users] [PATCH 1/2] Additional PCI IDs for IDE and network controllers Guennadi Liakhovetski
2008-04-14 6:33 ` Wolfgang Denk
2008-04-15 8:24 ` [U-Boot-Users] [PATCH 1/2 v2] " Guennadi Liakhovetski
2008-04-18 4:14 ` Wolfgang Denk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.