Merge branch 'keymap2'

Conflicts:
	common/keyboard.c

1 files changed, 5 insertions, 2 deletions

diff --git a/common/host.h b/common/host.h
index 8417987966..7c4f06601d 100644
--- a/common/host.h
+++ b/common/host.h
@@ -52,10 +52,13 @@ void host_consumer_send(uint16_t data);
 void host_add_key(uint8_t key);
 void host_del_key(uint8_t key);
 void host_clear_keys(void);
-void host_add_mod_bit(uint8_t mod);
-void host_del_mod_bit(uint8_t mod);
+
+uint8_t host_get_mods(void);
+void host_add_mods(uint8_t mods);
+void host_del_mods(uint8_t mods);
 void host_set_mods(uint8_t mods);
 void host_clear_mods(void);
+
 uint8_t host_has_anykey(void);
 uint8_t host_has_anymod(void);
 uint8_t host_get_first_key(void);