2002-08-21  Theodore A. Roth  <address@hidden>

	* common/macros.inc: Use <avr/io.h> instead of <io.h>.
	* doc/api/faq.dox: Use <avr/io.h> instead of <io.h>.
	* include/avr/eeprom.h: Use <avr/io.h> instead of <io.h>.
	* include/avr/ina90.h: Use <avr/eeprom.h> instead of <eeprom.h>.
	* include/avr/interrupt.h: Use <avr/io.h> instead of <io.h>.
	* include/avr/pgmspace.h: Use <avr/pgmspace.h> instead of <pgmspace.h>.
		Same for <io.h> and <ina90.h>
	* include/avr/timer.h: Use <avr/io.h> instead of <io.h>.
	* include/avr/wdt.h: Use <avr/io.h> instead of <io.h>.

Index: common/macros.inc
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/common/macros.inc,v
retrieving revision 1.1
diff -u -r1.1 macros.inc
--- common/macros.inc	5 Jul 2002 20:38:44 -0000	1.1
+++ common/macros.inc	22 Aug 2002 04:27:14 -0000
@@ -30,7 +30,7 @@
      Created by Marek Michalkiewicz <address@hidden>
  */
 
-#include <io.h>
+#include <avr/io.h>
 
 /* if not defined, assume old version with underscores */
 #ifndef __USER_LABEL_PREFIX__
Index: doc/api/faq.dox
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/doc/api/faq.dox,v
retrieving revision 1.5
diff -u -r1.5 faq.dox
--- doc/api/faq.dox	14 Aug 2002 22:21:52 -0000	1.5
+++ doc/api/faq.dox	22 Aug 2002 04:27:14 -0000
@@ -114,7 +114,7 @@
 \code
 ;; begin xram.S
 
-#include <io.h>
+#include <avr/io.h>
 
         .section .init1,"ax",@progbits
 
Index: include/avr/eeprom.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/eeprom.h,v
retrieving revision 1.1
diff -u -r1.1 eeprom.h
--- include/avr/eeprom.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/eeprom.h	22 Aug 2002 04:27:14 -0000
@@ -36,7 +36,7 @@
 #define __need_size_t
 #include <stddef.h>
 
-#include <io.h>
+#include <avr/io.h>
 
 /* return 1 if EEPROM is ready for a new read/write operation, 0 if not */
 #define eeprom_is_ready() bit_is_clear(EECR, EEWE)
Index: include/avr/ina90.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/ina90.h,v
retrieving revision 1.1
diff -u -r1.1 ina90.h
--- include/avr/ina90.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/ina90.h	22 Aug 2002 04:27:14 -0000
@@ -117,7 +117,7 @@
 #endif
 
 /* _EEGET, _EEPUT */
-#include <eeprom.h>
+#include <avr/eeprom.h>
 
 #define input(port) inb(port)
 #define output(port, val) outb(port, val)
Index: include/avr/interrupt.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/interrupt.h,v
retrieving revision 1.2
diff -u -r1.2 interrupt.h
--- include/avr/interrupt.h	9 Aug 2002 16:49:07 -0000	1.2
+++ include/avr/interrupt.h	22 Aug 2002 04:27:14 -0000
@@ -26,7 +26,7 @@
 #ifndef _AVR_INTERRUPT_H_
 #define _AVR_INTERRUPT_H_
 
-#include <io.h>
+#include <avr/io.h>
 
 /** \name Global manipulation of the interrupt flag
 
Index: include/avr/pgmspace.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/pgmspace.h,v
retrieving revision 1.2
diff -u -r1.2 pgmspace.h
--- include/avr/pgmspace.h	26 Jul 2002 05:49:44 -0000	1.2
+++ include/avr/pgmspace.h	22 Aug 2002 04:27:15 -0000
@@ -34,7 +34,7 @@
  */
 
 /** \defgroup avr_pgmspace Program Space String Utilities
-    \code #include <pgmspace.h> \endcode
+    \code #include <avr/pgmspace.h> \endcode
 
     The functions in this module provide interfaces for a program to access
     data stored in program space (flash memory) of the device.  In order to
@@ -52,7 +52,7 @@
 #define __need_size_t
 #include <stddef.h>
 
-/* #include <io.h> */
+/* #include <avr/io.h> */
 
 #ifndef __ATTR_CONST__
 #define __ATTR_CONST__ __attribute__((__const__))
@@ -87,7 +87,7 @@
 #define PSTR(s) ({static char __c[] PROGMEM = (s); __c;})
 
 /* _LPM(), _ELPM() */
-#include <ina90.h>
+#include <avr/ina90.h>
 
 static inline unsigned char __lpm_inline(unsigned short __addr) __ATTR_CONST__;
 static inline unsigned char __lpm_inline(unsigned short __addr)
Index: include/avr/timer.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/timer.h,v
retrieving revision 1.1
diff -u -r1.1 timer.h
--- include/avr/timer.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/timer.h	22 Aug 2002 04:27:15 -0000
@@ -26,7 +26,7 @@
 #ifndef _AVR_TIMER_H_
 #define _AVR_TIMER_H_
 
-#include <io.h>
+#include <avr/io.h>
 
 #ifdef __cplusplus
 extern "C" {
Index: include/avr/wdt.h
===================================================================
RCS file: /cvsroot/avr-libc/avr-libc/include/avr/wdt.h,v
retrieving revision 1.1
diff -u -r1.1 wdt.h
--- include/avr/wdt.h	5 Jul 2002 20:38:44 -0000	1.1
+++ include/avr/wdt.h	22 Aug 2002 04:27:15 -0000
@@ -30,7 +30,7 @@
 #ifndef _AVR_WDT_H_
 #define _AVR_WDT_H_
 
-#include <io.h>
+#include <avr/io.h>
 
 #define wdt_reset() __asm__ __volatile__ ("wdr")