Author: lcapitulino
Date: Mon Feb 12 19:00:32 2007
New Revision: 119983
Added:
packages/updates/2007.0/kernel-2.6/current/PATCHES/patches/DI33_atiixp_sb600_has_one_channel.patch
Modified:
packages/updates/2007.0/kernel-2.6/current/SPECS/kernel-2.6.spec
Log:
atiixp.c: sb600 ide only has one channel
Added:
packages/updates/2007.0/kernel-2.6/current/PATCHES/patches/DI33_atiixp_sb600_has_one_channel.patch
==============================================================================
--- (empty file)
+++
packages/updates/2007.0/kernel-2.6/current/PATCHES/patches/DI33_atiixp_sb600_has_one_channel.patch
Mon Feb 12 19:00:32 2007
@@ -0,0 +1,43 @@
+commit b25168dfdc162b4198fa6395cd191a20dddc6d34
+Author: Conke Hu <[EMAIL PROTECTED]>
+Date: Sat Jan 27 13:46:30 2007 +0100
+
+ atiixp.c: sb600 ide only has one channel
+
+ AMD/ATI SB600 IDE/PATA controller only has one channel.
+
+ Signed-off-by: Conke Hu <[EMAIL PROTECTED]>
+ Cc: Alan Cox <[EMAIL PROTECTED]>
+ Cc: Greg KH <[EMAIL PROTECTED]>
+ Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
+ Signed-off-by: Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
+
+---
+ drivers/ide/pci/atiixp.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+--- linux-2.6.17.orig/drivers/ide/pci/atiixp.c
++++ linux-2.6.17/drivers/ide/pci/atiixp.c
+@@ -327,6 +327,13 @@ static ide_pci_device_t atiixp_pci_info[
+ .autodma = AUTODMA,
+ .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}},
+ .bootable = ON_BOARD,
++ }, { /* 1 */
++ .name = "SB600_PATA",
++ .init_hwif = init_hwif_atiixp,
++ .channels = 1,
++ .autodma = AUTODMA,
++ .enablebits = {{0x48,0x01,0x00}, {0x00,0x00,0x00}},
++ .bootable = ON_BOARD,
+ }
+ };
+
+@@ -348,7 +355,7 @@ static struct pci_device_id atiixp_pci_t
+ { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP200_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0},
+ { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP300_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0},
+ { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0},
+- { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0},
++ { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP600_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 1},
+ { 0, },
+ };
+ MODULE_DEVICE_TABLE(pci, atiixp_pci_tbl);
Modified: packages/updates/2007.0/kernel-2.6/current/SPECS/kernel-2.6.spec
==============================================================================
--- packages/updates/2007.0/kernel-2.6/current/SPECS/kernel-2.6.spec
(original)
+++ packages/updates/2007.0/kernel-2.6/current/SPECS/kernel-2.6.spec Mon Feb
12 19:00:32 2007
@@ -1038,6 +1038,8 @@
something good to have at hand
- USB: rndis_host: fix crash while probing a Nokia S60 mobile
- rt2570 should report itself as "rtusb" (#24461)
+ - atiixp.c: sb600 ide only has one channel (#28505 - thanks to
+ Wolke <[EMAIL PROTECTED]>
* Fri Feb 02 2007 Luiz Capitulino <[EMAIL PROTECTED]> 2.6.17-10mdv2007.0
o Gwenole Beauchesne <[EMAIL PROTECTED]>
