diff options
| author | Alex Johnstone <alexjj@gmail.com> | 2016-04-05 07:44:37 -0700 |
|---|---|---|
| committer | Alex Johnstone <alexjj@gmail.com> | 2016-04-05 07:44:37 -0700 |
| commit | 1facc53a26294df7fb2a42f8f3d025176b8c384a (patch) | |
| tree | 98eebfa4beb49524c1345c2dd9e93d1fb8aa445a /keyboard/alps64 | |
| parent | 48899673af8b82638d601455f405f03db165bd57 (diff) | |
| parent | 931b0a79fc071498c229b0051be0ebadd934a549 (diff) | |
Merge pull request #5 from jackhumbert/master
Sync with upstream
Diffstat (limited to 'keyboard/alps64')
| -rw-r--r-- | keyboard/alps64/Makefile | 4 | ||||
| -rw-r--r-- | keyboard/alps64/keymaps/default.c (renamed from keyboard/alps64/keymap_plain.c) | 0 | ||||
| -rw-r--r-- | keyboard/alps64/keymaps/hasu.c (renamed from keyboard/alps64/keymap_hasu.c) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/keyboard/alps64/Makefile b/keyboard/alps64/Makefile index e90dcedb67..7634c4280e 100644 --- a/keyboard/alps64/Makefile +++ b/keyboard/alps64/Makefile @@ -53,9 +53,9 @@ SRC = keymap_common.c \ led.c ifdef KEYMAP - SRC := keymap_$(KEYMAP).c $(SRC) + SRC := keymaps/$(KEYMAP).c $(SRC) else - SRC := keymap_plain.c $(SRC) + SRC := keymaps/default.c $(SRC) endif CONFIG_H = config.h diff --git a/keyboard/alps64/keymap_plain.c b/keyboard/alps64/keymaps/default.c index a54899196a..a54899196a 100644 --- a/keyboard/alps64/keymap_plain.c +++ b/keyboard/alps64/keymaps/default.c diff --git a/keyboard/alps64/keymap_hasu.c b/keyboard/alps64/keymaps/hasu.c index d297d72fea..d297d72fea 100644 --- a/keyboard/alps64/keymap_hasu.c +++ b/keyboard/alps64/keymaps/hasu.c |