diff options
author | William Chang <william@factual.com> | 2019-05-09 21:16:06 -0700 |
---|---|---|
committer | William Chang <william@factual.com> | 2019-05-09 21:16:06 -0700 |
commit | 4b2d3288d013b1a71ea25402224c4a8225a099e9 (patch) | |
tree | b7f5dded777a950e63c4dd967260744336bfaa6b /quantum/template/ps2avrgb/usbconfig.h | |
parent | 57a6ea11df685d84a1ea07953e88f224ce2b24f7 (diff) | |
parent | bce391a663d2848bff8ffffca0e4bad771bd3890 (diff) |
resolved conflicts
Diffstat (limited to 'quantum/template/ps2avrgb/usbconfig.h')
-rw-r--r-- | quantum/template/ps2avrgb/usbconfig.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/quantum/template/ps2avrgb/usbconfig.h b/quantum/template/ps2avrgb/usbconfig.h index d2d848fcdc..54a7d20f14 100644 --- a/quantum/template/ps2avrgb/usbconfig.h +++ b/quantum/template/ps2avrgb/usbconfig.h @@ -8,8 +8,7 @@ * This Revision: $Id: usbconfig-prototype.h 785 2010-05-30 17:57:07Z cs $ */ -#ifndef __usbconfig_h_included__ -#define __usbconfig_h_included__ +#pragma once #include "config.h" @@ -392,5 +391,3 @@ section at the end of this file). /* #define USB_INTR_PENDING EIFR */ #define USB_INTR_PENDING_BIT INTF1 #define USB_INTR_VECTOR INT1_vect - -#endif /* __usbconfig_h_included__ */ |