2003-09-08  Theodore A. Roth  <address@hidden>

	* include/avr/boot.h: Set __SPM_REG using simpler logic.

Index: include/avr/boot.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/boot.h,v
retrieving revision 1.6
diff -p -c -3 -r1.6 boot.h
*** include/avr/boot.h	8 Sep 2003 21:00:43 -0000	1.6
--- include/avr/boot.h	8 Sep 2003 21:29:05 -0000
***************
*** 101,114 ****
  #include <limits.h>
  
  /* Check for SPM Control Register in processor. */
! #ifdef SPMCSR
  #  define __SPM_REG    SPMCSR
  #else
! #  ifdef SPMCR
! #    define __SPM_REG  SPMCR
! #  else
! #    error AVR processor does not provide bootloader support!
! #  endif
  #endif
  
  /** \ingroup avr_boot
--- 101,112 ----
  #include <limits.h>
  
  /* Check for SPM Control Register in processor. */
! #if defined (SPMCSR)
  #  define __SPM_REG    SPMCSR
+ #elif defined (SPMCR)
+ #  define __SPM_REG    SPMCR
  #else
! #  error AVR processor does not provide bootloader support!
  #endif
  
  /** \ingroup avr_boot