re #9978 rb3077 PCI ID conflict between amr(7d) and Dell C6220
--HG--
branch : stable-4.0
re #9978 rb3077 PCI ID conflict between amr(7d) and Dell C6220

*** 19,28 ****
--- 19,29 ----
  # CDDL HEADER END
  #
  
  #
  # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+ # Copyright 2012 Nexenta Systems, Inc.  All rights reserved.
  #
  
  #
  # The default for payload-bearing actions in this package is to appear in the
  # global zone only.  See the include file for greater detail, as well as
*** 40,50 ****
  dir path=usr/share/man
  dir path=usr/share/man/man7d
  driver name=amr class=scsi \
      alias=pci1000,532 \
      alias=pci1028,493 \
-     alias=pci1028,518 \
      alias=pci1028,520 \
      alias=pci1028,e \
      alias=pci1028,f
  file path=kernel/drv/$(ARCH64)/amr group=sys
  file path=kernel/drv/amr.conf group=sys
--- 41,50 ----