View | Details | Raw Unified | Return to bug 15923 | Differences between
and this patch

Collapse All | Expand All

(-)a/drivers/ata/ahci.c (+10 lines)
Lines 1053-1058 static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) Link Here
1053 
	if (pdev->vendor == PCI_VENDOR_ID_MARVELL && !marvell_enable)
 1053 
	if (pdev->vendor == PCI_VENDOR_ID_MARVELL && !marvell_enable)
1054 
		return -ENODEV;
 1054 
		return -ENODEV;
1055 

          1055
          

        

            

              
              
              1056
              
	/*

            

            

              1057
              
	 * For some reason, MCP89 on MacBook 7,1 doesn't work with

            

            

              1058
              
	 * ahci, use ata_generic instead.

            

            

              1059
              
	 */

            

            

              1060
              
	if (pdev->vendor == PCI_VENDOR_ID_NVIDIA &&

            

            

              1061
              
	    pdev->device == PCI_DEVICE_ID_NVIDIA_NFORCE_MCP89_SATA &&

            

            

              1062
              
	    pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE &&

            

            

              1063
              
	    pdev->subsystem_device == 0xcb89)

            

            

              1064
              
		return -ENODEV;

            

            

              1065
              

            

        

          1056
          
	/* Promise's PDC42819 is a SAS/SATA controller that has an AHCI mode.

          1066
          
	/* Promise's PDC42819 is a SAS/SATA controller that has an AHCI mode.

        

        

          1057
          
	 * At the moment, we can only use the AHCI mode. Let the users know

          1067
          
	 * At the moment, we can only use the AHCI mode. Let the users know

        

        

          1058
          
	 * that for SAS drives they're out of luck.

          1068
          
	 * that for SAS drives they're out of luck.

        



(-)a/drivers/ata/ata_generic.c
      (+6 lines)




  

    
      
            Lines 168-173
          static struct pci_device_id ata_generic[] = {
      
      
        Link Here
      
    
  

        

          168
          
	{ PCI_DEVICE(PCI_VENDOR_ID_VIA,    PCI_DEVICE_ID_VIA_82C561), },

          168
          
	{ PCI_DEVICE(PCI_VENDOR_ID_VIA,    PCI_DEVICE_ID_VIA_82C561), },

        

        

          169
          
	{ PCI_DEVICE(PCI_VENDOR_ID_OPTI,   PCI_DEVICE_ID_OPTI_82C558), },

          169
          
	{ PCI_DEVICE(PCI_VENDOR_ID_OPTI,   PCI_DEVICE_ID_OPTI_82C558), },

        

        

          170
          
	{ PCI_DEVICE(PCI_VENDOR_ID_CENATEK,PCI_DEVICE_ID_CENATEK_IDE), },

          170
          
	{ PCI_DEVICE(PCI_VENDOR_ID_CENATEK,PCI_DEVICE_ID_CENATEK_IDE), },

        

            

              
              
              171
              
	/*

            

            

              172
              
	 * For some reason, MCP89 on MacBook 7,1 doesn't work with

            

            

              173
              
	 * ahci, use ata_generic instead.

            

            

              174
              
	 */

            

            

              175
              
	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP89_SATA,

            

            

              176
              
	  PCI_VENDOR_ID_APPLE, 0xcb89, },

            

        

          171
          
#if !defined(CONFIG_PATA_TOSHIBA) && !defined(CONFIG_PATA_TOSHIBA_MODULE)

          177
          
#if !defined(CONFIG_PATA_TOSHIBA) && !defined(CONFIG_PATA_TOSHIBA_MODULE)

        

        

          172
          
	{ PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_1), },

          178
          
	{ PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_1), },

        

        

          173
          
	{ PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_2),  },

          179
          
	{ PCI_DEVICE(PCI_VENDOR_ID_TOSHIBA,PCI_DEVICE_ID_TOSHIBA_PICCOLO_2),  },

        



(-)a/include/linux/pci_ids.h
      (+1 lines)




  

    
      
            Lines 1261-1266
          
      
      
        Link Here
      
    
  

        

          1261
          
#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE       0x0759

          1261
          
#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE       0x0759

        

        

          1262
          
#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_SMBUS     0x07D8

          1262
          
#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_SMBUS     0x07D8

        

        

          1263
          
#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP79_SMBUS     0x0AA2

          1263
          
#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP79_SMBUS     0x0AA2

        

            

              
              
              1264
              
#define PCI_DEVICE_ID_NVIDIA_NFORCE_MCP89_SATA	    0x0D85

            

        

          1264
          

          1265
          

        

        

          1265
          
#define PCI_VENDOR_ID_IMS		0x10e0

          1266
          
#define PCI_VENDOR_ID_IMS		0x10e0

        

        

          1266
          
#define PCI_DEVICE_ID_IMS_TT128		0x9128

          1267
          
#define PCI_DEVICE_ID_IMS_TT128		0x9128

        






  

  Return to bug 15923