Update Temperature board driver to be AVR32 compatible when the ADC peripheral driver...

[pub/USBasp.git] / LUFA / Drivers / Board / USBKEY / Joystick.h

diff --git a/LUFA/Drivers/Board/USBKEY/Joystick.h b/LUFA/Drivers/Board/USBKEY/Joystick.h
index bbb2a16..b6dd8d1 100644 (file)
--- a/LUFA/Drivers/Board/USBKEY/Joystick.h
+++ b/LUFA/Drivers/Board/USBKEY/Joystick.h
@@ -61,7 +61,7 @@
                #endif\r
 \r
        /* Preprocessor Checks: */\r
-               #if !defined(INCLUDE_FROM_JOYSTICK_H)\r
+               #if !defined(__INCLUDE_FROM_JOYSTICK_H)\r
                        #error Do not include this file directly. Include LUFA/Drivers/Board/Joystick.h instead.\r
                #endif\r
 \r
@@ -100,8 +100,8 @@
                                PORTE |= JOY_EMASK;                             \r
                        }\r
                        \r
-                       static inline uint8_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;\r
-                       static inline uint8_t Joystick_GetStatus(void)\r
+                       static inline uintN_t Joystick_GetStatus(void) ATTR_WARN_UNUSED_RESULT;\r
+                       static inline uintN_t Joystick_GetStatus(void)\r
                        {\r
                                return (((uint8_t)~PINB & JOY_BMASK) | (((uint8_t)~PINE & JOY_EMASK) >> 1));\r
                        }\r