Removed SetSystemClockPrescaler() macro, the clock_prescale_set() avr-libc macro...

diff --cc Bootloaders/CDC/BootloaderCDC.c
index 54c7b7e,54c7b7e..60fe4a4
--- 1/Bootloaders/CDC/BootloaderCDC.c
--- 2/Bootloaders/CDC/BootloaderCDC.c
+++ b/Bootloaders/CDC/BootloaderCDC.c
@@@ -71,8 -71,8 +71,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
        \r
        /* Relocate the interrupt vector table to the bootloader section */\r
        MCUCR = (1 << IVCE);\r

diff --cc Bootloaders/CDC/BootloaderCDC.h
index a6e7755,a6e7755..dce84a5
--- 1/Bootloaders/CDC/BootloaderCDC.h
--- 2/Bootloaders/CDC/BootloaderCDC.h
+++ b/Bootloaders/CDC/BootloaderCDC.h
@@@ -41,6 -41,6 +41,7 @@@
                #include <avr/wdt.h>\r
                #include <avr/boot.h>\r
                #include <avr/eeprom.h>\r
++              #include <avr/power.h>\r
                #include <stdbool.h>\r
  \r
                #include "Descriptors.h"\r

diff --cc Bootloaders/DFU/BootloaderDFU.c
index 704133f,704133f..8cc5fd4
--- 1/Bootloaders/DFU/BootloaderDFU.c
--- 2/Bootloaders/DFU/BootloaderDFU.c
+++ b/Bootloaders/DFU/BootloaderDFU.c
@@@ -109,8 -109,8 +109,8 @@@ int main (void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
        \r
        /* Relocate the interrupt vector table to the bootloader section */\r
        MCUCR = (1 << IVCE);\r

diff --cc Bootloaders/DFU/BootloaderDFU.h
index b90fee1,b90fee1..21e8fce
--- 1/Bootloaders/DFU/BootloaderDFU.h
--- 2/Bootloaders/DFU/BootloaderDFU.h
+++ b/Bootloaders/DFU/BootloaderDFU.h
@@@ -42,6 -42,6 +42,7 @@@
                #include <avr/boot.h>\r
                #include <avr/pgmspace.h>\r
                #include <avr/eeprom.h>\r
++              #include <avr/power.h>\r
                #include <stdbool.h>\r
        \r
                #include "Descriptors.h"\r

diff --cc Bootloaders/TeensyHID/TeensyHID.c
index 4f09ac5,4f09ac5..fe20702
--- 1/Bootloaders/TeensyHID/TeensyHID.c
--- 2/Bootloaders/TeensyHID/TeensyHID.c
+++ b/Bootloaders/TeensyHID/TeensyHID.c
@@@ -53,8 -53,8 +53,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Relocate the interrupt vector table to the bootloader section */\r
        MCUCR = (1 << IVCE);\r

diff --cc Bootloaders/TeensyHID/TeensyHID.h
index a53fca3,a53fca3..a4773f8
--- 1/Bootloaders/TeensyHID/TeensyHID.h
--- 2/Bootloaders/TeensyHID/TeensyHID.h
+++ b/Bootloaders/TeensyHID/TeensyHID.h
@@@ -41,6 -41,6 +41,7 @@@
                #include <avr/wdt.h>\r
                #include <avr/boot.h>\r
                #include <avr/wdt.h>\r
++              #include <avr/power.h>\r
                #include <util/delay.h>\r
                #include <stdbool.h>\r
  \r

diff --cc Demos/AudioInput/AudioInput.c
index f5474b4,f5474b4..0db41c3
--- 1/Demos/AudioInput/AudioInput.c
--- 2/Demos/AudioInput/AudioInput.c
+++ b/Demos/AudioInput/AudioInput.c
@@@ -63,8 -63,8 +63,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
        \r
        /* Hardware Initialization */\r
        LEDs_Init();\r

diff --cc Demos/AudioInput/AudioInput.h
index 97978fd,97978fd..02c8380
--- 1/Demos/AudioInput/AudioInput.h
--- 2/Demos/AudioInput/AudioInput.h
+++ b/Demos/AudioInput/AudioInput.h
@@@ -39,6 -39,6 +39,7 @@@
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
++              #include <avr/power.h>\r
  \r
                #include "Descriptors.h"\r
                                \r

diff --cc Demos/AudioOutput/AudioOutput.c
index 184910e,184910e..3d2e324
--- 1/Demos/AudioOutput/AudioOutput.c
--- 2/Demos/AudioOutput/AudioOutput.c
+++ b/Demos/AudioOutput/AudioOutput.c
@@@ -66,8 -66,8 +66,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        LEDs_Init();\r

diff --cc Demos/AudioOutput/AudioOutput.h
index 3b99231,3b99231..0ad9e5b
--- 1/Demos/AudioOutput/AudioOutput.h
--- 2/Demos/AudioOutput/AudioOutput.h
+++ b/Demos/AudioOutput/AudioOutput.h
@@@ -39,6 -39,6 +39,7 @@@
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
++              #include <avr/power.h>\r
  \r
                #include "Descriptors.h"\r
                \r

diff --cc Demos/BluetoothHost/BluetoothHost.c
index 50bd1a8,50bd1a8..2e5ae44
--- 1/Demos/BluetoothHost/BluetoothHost.c
--- 2/Demos/BluetoothHost/BluetoothHost.c
+++ b/Demos/BluetoothHost/BluetoothHost.c
@@@ -74,8 -74,8 +74,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r

diff --cc Demos/BluetoothHost/BluetoothHost.h
index 5fe9dbd,5fe9dbd..51d4173
--- 1/Demos/BluetoothHost/BluetoothHost.h
--- 2/Demos/BluetoothHost/BluetoothHost.h
+++ b/Demos/BluetoothHost/BluetoothHost.h
@@@ -35,6 -35,6 +35,7 @@@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/pgmspace.h>\r
++              #include <avr/power.h>\r
                #include <stdio.h>\r
  \r
                #include "BluetoothStack.h"\r

diff --cc Demos/CDC/CDC.c
index 6e232a4,6e232a4..eeae625
--- 1/Demos/CDC/CDC.c
--- 2/Demos/CDC/CDC.c
+++ b/Demos/CDC/CDC.c
@@@ -87,8 -87,8 +87,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        Joystick_Init();\r

diff --cc Demos/CDC/CDC.h
index 98f30b5,98f30b5..d953303
--- 1/Demos/CDC/CDC.h
--- 2/Demos/CDC/CDC.h
+++ b/Demos/CDC/CDC.h
@@@ -39,6 -39,6 +39,7 @@@
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
++              #include <avr/power.h>\r
                #include <string.h>\r
  \r
                #include "Descriptors.h"\r

diff --cc Demos/CDCHost/CDCHost.c
index ac6d89a,ac6d89a..1f05ecb
--- 1/Demos/CDCHost/CDCHost.c
--- 2/Demos/CDCHost/CDCHost.c
+++ b/Demos/CDCHost/CDCHost.c
@@@ -59,8 -59,8 +59,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r

diff --cc Demos/CDCHost/CDCHost.h
index 2adbefd,2adbefd..21b9d67
--- 1/Demos/CDCHost/CDCHost.h
--- 2/Demos/CDCHost/CDCHost.h
+++ b/Demos/CDCHost/CDCHost.h
@@@ -40,6 -40,6 +40,7 @@@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/pgmspace.h>\r
++              #include <avr/power.h>\r
                #include <stdio.h>\r
  \r
                #include <LUFA/Version.h>                                // Library Version Information\r

diff --cc Demos/DualCDC/DualCDC.c
index 90f0099,90f0099..8e6e389
--- 1/Demos/DualCDC/DualCDC.c
--- 2/Demos/DualCDC/DualCDC.c
+++ b/Demos/DualCDC/DualCDC.c
@@@ -101,8 -101,8 +101,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        Joystick_Init();\r

diff --cc Demos/DualCDC/DualCDC.h
index 5a01e07,5a01e07..4c62abf
--- 1/Demos/DualCDC/DualCDC.h
--- 2/Demos/DualCDC/DualCDC.h
+++ b/Demos/DualCDC/DualCDC.h
@@@ -39,6 -39,6 +39,7 @@@
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
++              #include <avr/power.h>\r
                #include <string.h>\r
  \r
                #include "Descriptors.h"\r

diff --cc Demos/Joystick/Joystick.c
index 88d4158,88d4158..cd88227
--- 1/Demos/Joystick/Joystick.c
--- 2/Demos/Joystick/Joystick.c
+++ b/Demos/Joystick/Joystick.c
@@@ -58,8 -58,8 +58,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        Joystick_Init();\r

diff --cc Demos/Joystick/Joystick.h
index 966fa7e,966fa7e..79c7e49
--- 1/Demos/Joystick/Joystick.h
--- 2/Demos/Joystick/Joystick.h
+++ b/Demos/Joystick/Joystick.h
@@@ -39,6 -39,6 +39,7 @@@
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
++              #include <avr/power.h>\r
                #include <string.h>\r
  \r
                #include "Descriptors.h"\r

diff --cc Demos/Keyboard/Keyboard.c
index 92f4ae9,92f4ae9..22d406d
--- 1/Demos/Keyboard/Keyboard.c
--- 2/Demos/Keyboard/Keyboard.c
+++ b/Demos/Keyboard/Keyboard.c
@@@ -77,8 -77,8 +77,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        Joystick_Init();\r

diff --cc Demos/Keyboard/Keyboard.h
index e1aed1e,e1aed1e..6988e57
--- 1/Demos/Keyboard/Keyboard.h
--- 2/Demos/Keyboard/Keyboard.h
+++ b/Demos/Keyboard/Keyboard.h
@@@ -41,6 -41,6 +41,7 @@@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/interrupt.h>\r
++              #include <avr/power.h>\r
                #include <stdbool.h>\r
                #include <string.h>\r
  \r

diff --cc Demos/KeyboardFullInt/KeyboardFullInt.c
index 44f9830,44f9830..ed08137
--- 1/Demos/KeyboardFullInt/KeyboardFullInt.c
--- 2/Demos/KeyboardFullInt/KeyboardFullInt.c
+++ b/Demos/KeyboardFullInt/KeyboardFullInt.c
@@@ -70,8 -70,8 +70,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        Joystick_Init();\r

diff --cc Demos/KeyboardFullInt/KeyboardFullInt.h
index 7711faa,7711faa..cc6655a
--- 1/Demos/KeyboardFullInt/KeyboardFullInt.h
--- 2/Demos/KeyboardFullInt/KeyboardFullInt.h
+++ b/Demos/KeyboardFullInt/KeyboardFullInt.h
@@@ -41,6 -41,6 +41,7 @@@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/interrupt.h>\r
++              #include <avr/power.h>\r
                #include <stdbool.h>\r
                #include <string.h>\r
  \r

diff --cc Demos/KeyboardHost/KeyboardHost.c
index dd05bde,dd05bde..74d6555
--- 1/Demos/KeyboardHost/KeyboardHost.c
--- 2/Demos/KeyboardHost/KeyboardHost.c
+++ b/Demos/KeyboardHost/KeyboardHost.c
@@@ -59,8 -59,8 +59,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r

diff --cc Demos/KeyboardHost/KeyboardHost.h
index 97695f7,97695f7..388e50f
--- 1/Demos/KeyboardHost/KeyboardHost.h
--- 2/Demos/KeyboardHost/KeyboardHost.h
+++ b/Demos/KeyboardHost/KeyboardHost.h
@@@ -40,6 -40,6 +40,7 @@@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/pgmspace.h>\r
++              #include <avr/power.h>\r
                #include <stdio.h>\r
  \r
                #include <LUFA/Version.h>                                // Library Version Information\r

diff --cc Demos/KeyboardHostViaInt/KeyboardHostViaInt.c
index ecff951,ecff951..424eb85
--- 1/Demos/KeyboardHostViaInt/KeyboardHostViaInt.c
--- 2/Demos/KeyboardHostViaInt/KeyboardHostViaInt.c
+++ b/Demos/KeyboardHostViaInt/KeyboardHostViaInt.c
@@@ -59,8 -59,8 +59,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r

diff --cc Demos/KeyboardHostViaInt/KeyboardHostViaInt.h
index 22848ee,22848ee..7ae54e6
--- 1/Demos/KeyboardHostViaInt/KeyboardHostViaInt.h
--- 2/Demos/KeyboardHostViaInt/KeyboardHostViaInt.h
+++ b/Demos/KeyboardHostViaInt/KeyboardHostViaInt.h
@@@ -41,6 -41,6 +41,7 @@@
                #include <avr/pgmspace.h>\r
                #include <avr/interrupt.h>\r
                #include <avr/wdt.h>\r
++              #include <avr/power.h>\r
                #include <stdio.h>\r
  \r
                #include <LUFA/Version.h>                                // Library Version Information\r

diff --cc Demos/KeyboardHostWithParser/KeyboardHostWithParser.c
index f0eec2b,f0eec2b..f7a0087
--- 1/Demos/KeyboardHostWithParser/KeyboardHostWithParser.c
--- 2/Demos/KeyboardHostWithParser/KeyboardHostWithParser.c
+++ b/Demos/KeyboardHostWithParser/KeyboardHostWithParser.c
@@@ -59,8 -59,8 +59,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r

diff --cc Demos/KeyboardHostWithParser/KeyboardHostWithParser.h
index 6846e17,6846e17..fece679
--- 1/Demos/KeyboardHostWithParser/KeyboardHostWithParser.h
--- 2/Demos/KeyboardHostWithParser/KeyboardHostWithParser.h
+++ b/Demos/KeyboardHostWithParser/KeyboardHostWithParser.h
@@@ -35,6 -35,6 +35,7 @@@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/pgmspace.h>\r
++              #include <avr/power.h>\r
                #include <stdio.h>\r
  \r
                #include <LUFA/Version.h>                                // Library Version Information\r

diff --cc Demos/KeyboardMouse/KeyboardMouse.c
index 383c66a,383c66a..8108a30
--- 1/Demos/KeyboardMouse/KeyboardMouse.c
--- 2/Demos/KeyboardMouse/KeyboardMouse.c
+++ b/Demos/KeyboardMouse/KeyboardMouse.c
@@@ -67,8 -67,8 +67,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        Joystick_Init();\r

diff --cc Demos/KeyboardMouse/KeyboardMouse.h
index f5c1d4e,f5c1d4e..9794159
--- 1/Demos/KeyboardMouse/KeyboardMouse.h
--- 2/Demos/KeyboardMouse/KeyboardMouse.h
+++ b/Demos/KeyboardMouse/KeyboardMouse.h
@@@ -35,6 -35,6 +35,7 @@@
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
++              #include <avr/power.h>\r
                #include <stdbool.h>\r
                #include <string.h>\r
  \r

diff --cc Demos/KeyboardViaInt/KeyboardViaInt.c
index 7916506,7916506..b66506d
--- 1/Demos/KeyboardViaInt/KeyboardViaInt.c
--- 2/Demos/KeyboardViaInt/KeyboardViaInt.c
+++ b/Demos/KeyboardViaInt/KeyboardViaInt.c
@@@ -76,8 -76,8 +76,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        Joystick_Init();\r

diff --cc Demos/KeyboardViaInt/KeyboardViaInt.h
index 833bc91,833bc91..7dfe60d
--- 1/Demos/KeyboardViaInt/KeyboardViaInt.h
--- 2/Demos/KeyboardViaInt/KeyboardViaInt.h
+++ b/Demos/KeyboardViaInt/KeyboardViaInt.h
@@@ -41,6 -41,6 +41,7 @@@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/interrupt.h>\r
++              #include <avr/power.h>\r
                #include <stdbool.h>\r
                #include <string.h>\r
  \r

diff --cc Demos/MIDI/MIDI.c
index a9c827a,a9c827a..c0e4f9d
--- 1/Demos/MIDI/MIDI.c
--- 2/Demos/MIDI/MIDI.c
+++ b/Demos/MIDI/MIDI.c
@@@ -58,8 -58,8 +58,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
        \r
        /* Hardware Initialization */\r
        Joystick_Init();\r

diff --cc Demos/MIDI/MIDI.h
index 1775c63,1775c63..733a7ba
--- 1/Demos/MIDI/MIDI.h
--- 2/Demos/MIDI/MIDI.h
+++ b/Demos/MIDI/MIDI.h
@@@ -39,6 -39,6 +39,7 @@@
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
++              #include <avr/power.h>\r
                #include <stdbool.h>\r
  \r
                #include "Descriptors.h"\r

diff --cc Demos/MassStorage/MassStorage.c
index fb61530,fb61530..34fcee4
--- 1/Demos/MassStorage/MassStorage.c
--- 2/Demos/MassStorage/MassStorage.c
+++ b/Demos/MassStorage/MassStorage.c
@@@ -68,8 -68,8 +68,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        LEDs_Init();\r

diff --cc Demos/MassStorage/MassStorage.h
index 4f0e5b5,4f0e5b5..3525340
--- 1/Demos/MassStorage/MassStorage.h
--- 2/Demos/MassStorage/MassStorage.h
+++ b/Demos/MassStorage/MassStorage.h
@@@ -39,6 -39,6 +39,7 @@@
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
++              #include <avr/power.h>\r
  \r
                #include "Descriptors.h"\r
                #include "SCSI.h"\r

diff --cc Demos/MassStorageHost/MassStorageHost.c
index ee4befd,ee4befd..d042b78
--- 1/Demos/MassStorageHost/MassStorageHost.c
--- 2/Demos/MassStorageHost/MassStorageHost.c
+++ b/Demos/MassStorageHost/MassStorageHost.c
@@@ -63,8 -63,8 +63,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r

diff --cc Demos/MassStorageHost/MassStorageHost.h
index 3ace6d4,3ace6d4..b130cfe
--- 1/Demos/MassStorageHost/MassStorageHost.h
--- 2/Demos/MassStorageHost/MassStorageHost.h
+++ b/Demos/MassStorageHost/MassStorageHost.h
@@@ -40,6 -40,6 +40,7 @@@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/pgmspace.h>\r
++              #include <avr/power.h>\r
                #include <stdio.h>\r
                #include <ctype.h>\r
  \r

diff --cc Demos/Mouse/Mouse.c
index 9080efb,9080efb..3e59706
--- 1/Demos/Mouse/Mouse.c
--- 2/Demos/Mouse/Mouse.c
+++ b/Demos/Mouse/Mouse.c
@@@ -76,8 -76,8 +76,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        Joystick_Init();\r

diff --cc Demos/Mouse/Mouse.h
index 1c7b588,1c7b588..5090812
--- 1/Demos/Mouse/Mouse.h
--- 2/Demos/Mouse/Mouse.h
+++ b/Demos/Mouse/Mouse.h
@@@ -40,6 -40,6 +40,7 @@@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/interrupt.h>\r
++              #include <avr/power.h>\r
                #include <stdbool.h>\r
                #include <string.h>\r
                \r

diff --cc Demos/MouseFullInt/MouseFullInt.c
index 28267a1,28267a1..98782b6
--- 1/Demos/MouseFullInt/MouseFullInt.c
--- 2/Demos/MouseFullInt/MouseFullInt.c
+++ b/Demos/MouseFullInt/MouseFullInt.c
@@@ -69,8 -69,8 +69,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        Joystick_Init();\r

diff --cc Demos/MouseFullInt/MouseFullInt.h
index 9fdc51d,9fdc51d..f46f7ef
--- 1/Demos/MouseFullInt/MouseFullInt.h
--- 2/Demos/MouseFullInt/MouseFullInt.h
+++ b/Demos/MouseFullInt/MouseFullInt.h
@@@ -40,6 -40,6 +40,7 @@@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/interrupt.h>\r
++              #include <avr/power.h>\r
                #include <stdbool.h>\r
                #include <string.h>\r
                \r

diff --cc Demos/MouseHost/MouseHost.c
index 2bc13a9,2bc13a9..ee7aec9
--- 1/Demos/MouseHost/MouseHost.c
--- 2/Demos/MouseHost/MouseHost.c
+++ b/Demos/MouseHost/MouseHost.c
@@@ -59,8 -59,8 +59,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
        \r
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r

diff --cc Demos/MouseHost/MouseHost.h
index 9e47495,9e47495..1bd52eb
--- 1/Demos/MouseHost/MouseHost.h
--- 2/Demos/MouseHost/MouseHost.h
+++ b/Demos/MouseHost/MouseHost.h
@@@ -40,6 -40,6 +40,7 @@@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/pgmspace.h>\r
++              #include <avr/power.h>\r
                #include <stdio.h>\r
  \r
                #include <LUFA/Version.h>                                // Library Version Information\r

diff --cc Demos/MouseHostViaInt/MouseHostViaInt.c
index c4c3778,c4c3778..a44f707
--- 1/Demos/MouseHostViaInt/MouseHostViaInt.c
--- 2/Demos/MouseHostViaInt/MouseHostViaInt.c
+++ b/Demos/MouseHostViaInt/MouseHostViaInt.c
@@@ -59,8 -59,8 +59,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r

diff --cc Demos/MouseHostViaInt/MouseHostViaInt.h
index c4238c8,c4238c8..459bc22
--- 1/Demos/MouseHostViaInt/MouseHostViaInt.h
--- 2/Demos/MouseHostViaInt/MouseHostViaInt.h
+++ b/Demos/MouseHostViaInt/MouseHostViaInt.h
@@@ -41,6 -41,6 +41,7 @@@
                #include <avr/pgmspace.h>\r
                #include <avr/interrupt.h>\r
                #include <avr/wdt.h>\r
++              #include <avr/power.h>\r
                #include <stdio.h>\r
  \r
                #include <LUFA/Version.h>                                // Library Version Information\r

diff --cc Demos/MouseHostWithParser/MouseHostWithParser.c
index 97bad3b,97bad3b..5ccda49
--- 1/Demos/MouseHostWithParser/MouseHostWithParser.c
--- 2/Demos/MouseHostWithParser/MouseHostWithParser.c
+++ b/Demos/MouseHostWithParser/MouseHostWithParser.c
@@@ -59,8 -59,8 +59,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
        \r
        /* Hardware Initialization */\r
        SerialStream_Init(9600, false);\r

diff --cc Demos/MouseHostWithParser/MouseHostWithParser.h
index 6d1ce32,6d1ce32..b59ab9a
--- 1/Demos/MouseHostWithParser/MouseHostWithParser.h
--- 2/Demos/MouseHostWithParser/MouseHostWithParser.h
+++ b/Demos/MouseHostWithParser/MouseHostWithParser.h
@@@ -35,6 -35,6 +35,7 @@@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/pgmspace.h>\r
++              #include <avr/power.h>\r
                #include <stdio.h>\r
  \r
                #include <LUFA/Version.h>                                // Library Version Information\r

diff --cc Demos/MouseViaInt/MouseViaInt.c
index a4b863c,a4b863c..445fb49
--- 1/Demos/MouseViaInt/MouseViaInt.c
--- 2/Demos/MouseViaInt/MouseViaInt.c
+++ b/Demos/MouseViaInt/MouseViaInt.c
@@@ -74,8 -74,8 +74,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        Joystick_Init();\r

diff --cc Demos/MouseViaInt/MouseViaInt.h
index 6f4b9ab,6f4b9ab..ccc37ef
--- 1/Demos/MouseViaInt/MouseViaInt.h
--- 2/Demos/MouseViaInt/MouseViaInt.h
+++ b/Demos/MouseViaInt/MouseViaInt.h
@@@ -40,6 -40,6 +40,7 @@@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/interrupt.h>\r
++              #include <avr/power.h>\r
                #include <stdbool.h>\r
                #include <string.h>\r
                \r

diff --cc Demos/RNDISEthernet/RNDISEthernet.c
index 255a53b,255a53b..3f9bb18
--- 1/Demos/RNDISEthernet/RNDISEthernet.c
--- 2/Demos/RNDISEthernet/RNDISEthernet.c
+++ b/Demos/RNDISEthernet/RNDISEthernet.c
@@@ -60,8 -60,8 +60,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        LEDs_Init();\r

diff --cc Demos/RNDISEthernet/RNDISEthernet.h
index 4a0f3c1,4a0f3c1..83e49ce
--- 1/Demos/RNDISEthernet/RNDISEthernet.h
--- 2/Demos/RNDISEthernet/RNDISEthernet.h
+++ b/Demos/RNDISEthernet/RNDISEthernet.h
@@@ -39,9 -39,9 +39,10 @@@
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
++              #include <avr/pgmspace.h>\r
++              #include <avr/power.h>\r
                #include <string.h>\r
                #include <stdio.h>\r
--              #include <avr/pgmspace.h>\r
  \r
                #include "Descriptors.h"\r
                #include "RNDIS.h"\r

diff --cc Demos/StillImageHost/StillImageHost.h
index 5669c82,5669c82..7757b08
--- 1/Demos/StillImageHost/StillImageHost.h
--- 2/Demos/StillImageHost/StillImageHost.h
+++ b/Demos/StillImageHost/StillImageHost.h
@@@ -39,6 -39,6 +39,7 @@@
        /* Includes: */\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
++              #include <avr/power.h>\r
                #include <stdio.h>\r
                \r
                #include "ConfigDescriptor.h"\r

diff --cc Demos/TestApp/TestApp.c
index e7ee526,e7ee526..a66a728
--- 1/Demos/TestApp/TestApp.c
--- 2/Demos/TestApp/TestApp.c
+++ b/Demos/TestApp/TestApp.c
@@@ -61,7 -61,7 +61,7 @@@ int main(void
        wdt_disable();\r
  \r
        /* Disable clock division */\r
--      SetSystemClockPrescaler(0);\r
++      clock_prescale_set(clock_div_1);\r
        \r
        /* Hardware initialization */\r
        SerialStream_Init(9600, false);\r

diff --cc Demos/TestApp/TestApp.h
index 4175fad,4175fad..cb26239
--- 1/Demos/TestApp/TestApp.h
--- 2/Demos/TestApp/TestApp.h
+++ b/Demos/TestApp/TestApp.h
@@@ -40,6 -40,6 +40,7 @@@
                #include <avr/io.h>\r
                #include <avr/interrupt.h>\r
                #include <avr/wdt.h>\r
++              #include <avr/power.h>\r
  \r
                #include <LUFA/Version.h>                               // Library Version Information\r
                #include <LUFA/Drivers/USB/USB.h>                       // USB Functionality\r

diff --cc Demos/USBtoSerial/USBtoSerial.c
index 0cef8d1,0cef8d1..0495826
--- 1/Demos/USBtoSerial/USBtoSerial.c
--- 2/Demos/USBtoSerial/USBtoSerial.c
+++ b/Demos/USBtoSerial/USBtoSerial.c
@@@ -72,8 -72,8 +72,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        LEDs_Init();\r

diff --cc Demos/USBtoSerial/USBtoSerial.h
index f363fa9,f363fa9..3fb6d7d
--- 1/Demos/USBtoSerial/USBtoSerial.h
--- 2/Demos/USBtoSerial/USBtoSerial.h
+++ b/Demos/USBtoSerial/USBtoSerial.h
@@@ -40,6 -40,6 +40,7 @@@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/interrupt.h>
++              #include <avr/power.h>\r
  \r
                #include "Descriptors.h"\r
                #include "RingBuff.h"\r

diff --cc LUFA/ChangeLog.txt
index f699507,f699507..1a2b9f8
--- 1/LUFA/ChangeLog.txt
--- 2/LUFA/ChangeLog.txt
+++ b/LUFA/ChangeLog.txt
@@@ -28,6 -28,6 +28,7 @@@
    *  - Mass Storage Host demo now uses a USB_STREAM_TIMEOUT_MS of two seconds to maintain compatibility with poorly designed devices\r
    *  - Function attribute ATTR_ALWAYSINLINE renamed to ATTR_ALWAYS_INLINE to match other function attribute macro naming conventions\r
    *  - Added ATTR_ALWAYS_INLINE attribute to several key inlined library components, to ensure they are inlined in all circumstances\r
++  *  - Removed SetSystemClockPrescaler() macro, the clock_prescale_set() avr-libc macro has been corrected in recent avr-libc versions\r
    *\r
    *  \section Sec_ChangeLog090209 Version 090209\r
    *\r

diff --cc LUFA/Common/Common.h
index 97e9ce9,97e9ce9..ed2d1bc
--- 1/LUFA/Common/Common.h
--- 2/LUFA/Common/Common.h
+++ b/LUFA/Common/Common.h
@@@ -88,27 -88,27 +88,6 @@@
                                                        } }MACROE\r
  \r
                /* Inline Functions: */\r
--                      /** Function for reliably setting the AVR's system clock prescaler, using inline assembly. This function\r
--                       *  is guaranteed to operate reliably regardless of optimization setting or other compile time options. \r
--                       *\r
--                       *  \param PrescalerMask   The mask of the new prescaler setting for CLKPR\r
--                       */\r
--                      static inline void SetSystemClockPrescaler(uint8_t PrescalerMask)\r
--                      {\r
--                                      uint8_t tmp = (1 << CLKPCE);\r
--                                      __asm__ __volatile__ (\r
--                                                      "in __tmp_reg__,__SREG__" "\n\t"\r
--                                                      "cli" "\n\t"\r
--                                                      "sts %1, %0" "\n\t"\r
--                                                      "sts %1, %2" "\n\t"\r
--                                                      "out __SREG__, __tmp_reg__"\r
--                                                      : /* no outputs */\r
--                                                      : "d" (tmp),\r
--                                                        "M" (_SFR_MEM_ADDR(CLKPR)),\r
--                                                        "d" (PrescalerMask)\r
--                                                      : "r0");\r
--                      }\r
--\r
                        /** Function to reverse the individual bits in a byte - i.e. bit 7 is moved to bit 0, bit 6 to bit 1,\r
                         *  etc.\r
                         *\r

diff --cc LUFA/MigrationInformation.txt
index ebfc364,ebfc364..364f09c
--- 1/LUFA/MigrationInformation.txt
--- 2/LUFA/MigrationInformation.txt
+++ b/LUFA/MigrationInformation.txt
@@@ -17,6 -17,6 +17,8 @@@
   *      defined in the project makefile and passed to the compiler via the -D switch.\r
   *    - The makefile EEPROM programming targets for FLIP and dfu-programmer no longer program in the FLASH data in addition to the\r
   *      EEPROM data into the device. If both are to be programmed, both the EEPROM and FLASH programming targets must be called.\r
++ *    - As the avr-libc macro has been corrected in recent avr-libc distributions, the SetSystemClockPrescaler() macro has been removed.\r
++ *      Include <avr/power.h> and call clock_prescale_set(clock_div_1); instead on recent avr-libc distributions.\r
   *\r
   *  <b>Library Demos</b>\r
   *    - The USBtoSerial demo now discards all data when not connected to a host, rather than buffering it for later transmission.\r

diff --cc Projects/AVRISP_Programmer/AVRISP_Programmer.c
index 9ba3c0e,9ba3c0e..4bc4f9c
--- 1/Projects/AVRISP_Programmer/AVRISP_Programmer.c
--- 2/Projects/AVRISP_Programmer/AVRISP_Programmer.c
+++ b/Projects/AVRISP_Programmer/AVRISP_Programmer.c
@@@ -167,8 -167,8 +167,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        LEDs_Init();\r

diff --cc Projects/AVRISP_Programmer/AVRISP_Programmer.h
index 4c98d6b,4c98d6b..c6ac13f
--- 1/Projects/AVRISP_Programmer/AVRISP_Programmer.h
--- 2/Projects/AVRISP_Programmer/AVRISP_Programmer.h
+++ b/Projects/AVRISP_Programmer/AVRISP_Programmer.h
@@@ -37,10 -37,10 +37,11 @@@
  #define _AVRISP_PROGRAMMER_H_\r
  \r
        /* Includes: */\r
--              #include <util/delay.h>\r
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/interrupt.h>\r
++              #include <avr/power.h>\r
++              #include <util/delay.h>\r
  \r
                #include "Descriptors.h"\r
                #include "RingBuff.h"\r

diff --cc Projects/Magstripe/Magstripe.c
index 3696c12,3696c12..2826c14
--- 1/Projects/Magstripe/Magstripe.c
--- 2/Projects/Magstripe/Magstripe.c
+++ b/Projects/Magstripe/Magstripe.c
@@@ -93,8 -93,8 +93,8 @@@ int main(void
        MCUSR &= ~(1 << WDRF);\r
        wdt_disable();\r
  \r
--      /* Disable Clock Division */\r
--      SetSystemClockPrescaler(0);\r
++      /* Disable clock division */\r
++      clock_prescale_set(clock_div_1);\r
  \r
        /* Hardware Initialization */\r
        Magstripe_Init();\r

diff --cc Projects/Magstripe/Magstripe.h
index cde2fcd,cde2fcd..61f3098
--- 1/Projects/Magstripe/Magstripe.h
--- 2/Projects/Magstripe/Magstripe.h
+++ b/Projects/Magstripe/Magstripe.h
@@@ -41,6 -41,6 +41,7 @@@
                #include <avr/io.h>\r
                #include <avr/wdt.h>\r
                #include <avr/interrupt.h>\r
++              #include <avr/power.h>\r
                #include <stdbool.h>\r
                #include <string.h>\r
  \r