5255 uts shouldn't open-code ISP2

*** 21,39 ****
  /*
   * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   */
  
- #pragma ident   "%Z%%M% %I%     %E% SMI"
- 
  /*
   * t1394.c
   *    1394 Target Driver Interface
   *    This file contains all of the 1394 Software Framework routines called
   *    by target drivers
   */
  
  #include <sys/conf.h>
  #include <sys/ddi.h>
  #include <sys/sunddi.h>
  #include <sys/types.h>
  #include <sys/kmem.h>
--- 21,38 ----
  /*
   * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   */
  
  /*
   * t1394.c
   *    1394 Target Driver Interface
   *    This file contains all of the 1394 Software Framework routines called
   *    by target drivers
   */
  
+ #include <sys/sysmacros.h>
  #include <sys/conf.h>
  #include <sys/ddi.h>
  #include <sys/sunddi.h>
  #include <sys/types.h>
  #include <sys/kmem.h>
*** 1907,1917 ****
  
          /* Test conditions specific to T1394_NO_IRM_ALLOC */
          temp = props->cec_channel_mask;
          if (props->cec_options & T1394_NO_IRM_ALLOC) {
                  /* If T1394_NO_IRM_ALLOC, then only one bit should be set */
!                 if ((temp & (temp - 1)) != 0) {
                          TNF_PROBE_1(t1394_alloc_isoch_cec_error,
                              S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg,
                              "Invalid channel mask");
                          TNF_PROBE_0_DEBUG(t1394_alloc_isoch_cec_exit,
                              S1394_TNF_SL_ISOCH_STACK, "");
--- 1906,1916 ----
  
          /* Test conditions specific to T1394_NO_IRM_ALLOC */
          temp = props->cec_channel_mask;
          if (props->cec_options & T1394_NO_IRM_ALLOC) {
                  /* If T1394_NO_IRM_ALLOC, then only one bit should be set */
!                 if (!ISP2(temp)) {
                          TNF_PROBE_1(t1394_alloc_isoch_cec_error,
                              S1394_TNF_SL_ISOCH_ERROR, "", tnf_string, msg,
                              "Invalid channel mask");
                          TNF_PROBE_0_DEBUG(t1394_alloc_isoch_cec_exit,
                              S1394_TNF_SL_ISOCH_STACK, "");