From: Priyadi Iman Nurcahyo <priyadi@priyadi.net>
Date: Tue, 14 Feb 2017 22:25:45 +0000 (+0700)
Subject: Merge branch 'layer_state_set_kb' into promethium
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d0ee5292b6ea7593ac4e2248deb33103e9936887;hp=369b3dc72329d730ef608e7a1f69327bf4ce1c41;p=qmk_firmware.git

Merge branch 'layer_state_set_kb' into promethium
---

diff --git a/tmk_core/common/action_layer.h b/tmk_core/common/action_layer.h
index 785bb5be4..d89ed6e5c 100644
--- a/tmk_core/common/action_layer.h
+++ b/tmk_core/common/action_layer.h
@@ -27,10 +27,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 extern uint32_t default_layer_state;
 void default_layer_debug(void);
-uint32_t default_layer_set(uint32_t state);
+void default_layer_set(uint32_t state);
 
 __attribute__((weak))
-void default_layer_state_set_kb(uint32_t state);
+uint32_t default_layer_state_set_kb(uint32_t state);
 
 #ifndef NO_ACTION_LAYER
 /* bitwise operation */