* [PATCH] pata_marvell: Add another PCI identifier
@ 2007-08-22 22:27 Alan Cox
2007-08-23 0:16 ` Robin H. Johnson
2007-08-23 9:30 ` Jeff Garzik
0 siblings, 2 replies; 4+ messages in thread
From: Alan Cox @ 2007-08-22 22:27 UTC (permalink / raw)
To: akpm, linux-ide, jeff
Signed-off-by: Alan Cox <alan@redhat.com>
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.23rc3-mm1/drivers/ata/pata_marvell.c linux-2.6.23rc3-mm1/drivers/ata/pata_marvell.c
--- linux.vanilla-2.6.23rc3-mm1/drivers/ata/pata_marvell.c 2007-08-22 17:23:00.000000000 +0100
+++ linux-2.6.23rc3-mm1/drivers/ata/pata_marvell.c 2007-08-22 17:46:28.000000000 +0100
@@ -190,7 +190,8 @@
static const struct pci_device_id marvell_pci_tbl[] = {
{ PCI_DEVICE(0x11AB, 0x6101), },
- { PCI_DEVICE(0x11AB, 0x6145), },
+ { PCI_DEVICE(0x11AB, 0x6121), },
+ { PCI_DEVICE(0x11AB, 0x6123), },
{ } /* terminate list */
};
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] pata_marvell: Add another PCI identifier
2007-08-22 22:27 [PATCH] pata_marvell: Add another PCI identifier Alan Cox
@ 2007-08-23 0:16 ` Robin H. Johnson
2007-08-23 12:24 ` Alan Cox
2007-08-23 9:30 ` Jeff Garzik
1 sibling, 1 reply; 4+ messages in thread
From: Robin H. Johnson @ 2007-08-23 0:16 UTC (permalink / raw)
To: Alan Cox, linux-ide; +Cc: akpm, jeff
[-- Attachment #1: Type: text/plain, Size: 534 bytes --]
On Wed, Aug 22, 2007 at 11:27:05PM +0100, Alan Cox wrote:
> static const struct pci_device_id marvell_pci_tbl[] = {
> { PCI_DEVICE(0x11AB, 0x6101), },
> - { PCI_DEVICE(0x11AB, 0x6145), },
Why is this ID being removed?
Not that I have that model (I have 0x6101), it just looks weird given
the patch description to "Add another PCI identifier" and I thought I
should check.
--
Robin Hugh Johnson
Gentoo Linux Developer
E-Mail : robbat2@gentoo.org
GnuPG FP : 11AC BA4F 4778 E3F6 E4ED F38E B27B 944E 3488 4E85
[-- Attachment #2: Type: application/pgp-signature, Size: 321 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] pata_marvell: Add another PCI identifier
2007-08-22 22:27 [PATCH] pata_marvell: Add another PCI identifier Alan Cox
2007-08-23 0:16 ` Robin H. Johnson
@ 2007-08-23 9:30 ` Jeff Garzik
1 sibling, 0 replies; 4+ messages in thread
From: Jeff Garzik @ 2007-08-23 9:30 UTC (permalink / raw)
To: Alan Cox; +Cc: akpm, linux-ide
Alan Cox wrote:
> Signed-off-by: Alan Cox <alan@redhat.com>
>
> diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.23rc3-mm1/drivers/ata/pata_marvell.c linux-2.6.23rc3-mm1/drivers/ata/pata_marvell.c
> --- linux.vanilla-2.6.23rc3-mm1/drivers/ata/pata_marvell.c 2007-08-22 17:23:00.000000000 +0100
> +++ linux-2.6.23rc3-mm1/drivers/ata/pata_marvell.c 2007-08-22 17:46:28.000000000 +0100
> @@ -190,7 +190,8 @@
>
> static const struct pci_device_id marvell_pci_tbl[] = {
> { PCI_DEVICE(0x11AB, 0x6101), },
> - { PCI_DEVICE(0x11AB, 0x6145), },
> + { PCI_DEVICE(0x11AB, 0x6121), },
> + { PCI_DEVICE(0x11AB, 0x6123), },
> { } /* terminate list */
same question as with other poster: where does 0x6145 go, and why?
Is this for -mm only?
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] pata_marvell: Add another PCI identifier
2007-08-23 0:16 ` Robin H. Johnson
@ 2007-08-23 12:24 ` Alan Cox
0 siblings, 0 replies; 4+ messages in thread
From: Alan Cox @ 2007-08-23 12:24 UTC (permalink / raw)
To: Robin H. Johnson; +Cc: linux-ide, akpm, jeff
On Wed, 22 Aug 2007 17:16:26 -0700
"Robin H. Johnson" <robbat2@gentoo.org> wrote:
> On Wed, Aug 22, 2007 at 11:27:05PM +0100, Alan Cox wrote:
> > static const struct pci_device_id marvell_pci_tbl[] = {
> > { PCI_DEVICE(0x11AB, 0x6101), },
> > - { PCI_DEVICE(0x11AB, 0x6145), },
> Why is this ID being removed?
>
> Not that I have that model (I have 0x6101), it just looks weird given
> the patch description to "Add another PCI identifier" and I thought I
> should check.
Merge error - well spotted. I'll send a further patch to put it back
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-08-23 12:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-08-22 22:27 [PATCH] pata_marvell: Add another PCI identifier Alan Cox
2007-08-23 0:16 ` Robin H. Johnson
2007-08-23 12:24 ` Alan Cox
2007-08-23 9:30 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).