summaryrefslogtreecommitdiff
path: root/include/keyboard_scan.h
diff options
context:
space:
mode:
authorBill Richardson <wfrichar@chromium.org>2013-04-24 14:39:53 -0700
committerChromeBot <chrome-bot@google.com>2013-04-24 16:32:58 -0700
commit0bfb7ddd0713b3476a077f905e96dfa9b1e22d86 (patch)
tree9624ef46c4442a77bfd1c025e95635c7b534e903 /include/keyboard_scan.h
parent39b0f6ce0c86a2b8adf37624c08279bfe322686e (diff)
downloadchrome-ec-0bfb7ddd0713b3476a077f905e96dfa9b1e22d86.tar.gz
Replace generated CONFIG_TASK_ macros with HAS_TASK_
CONFIG_ macros should be set directly. Expanding the task names in the same way made it difficult to tell what was a configuration choice and what was due to changes in ec.tasklist BUG=chrome-os-partner:18343 TEST=build all, run link BRANCH=none Change-Id: Ib82e34f974238ee2dd216f33b701b6f4c6a4f1f1 Signed-off-by: Bill Richardson <wfrichar@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/49098 Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'include/keyboard_scan.h')
-rw-r--r--include/keyboard_scan.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/keyboard_scan.h b/include/keyboard_scan.h
index 5ce76cfd1f..bc956cc685 100644
--- a/include/keyboard_scan.h
+++ b/include/keyboard_scan.h
@@ -55,7 +55,7 @@ enum boot_key {
BOOT_KEY_OTHER = -1, /* None of the above */
};
-#ifdef CONFIG_TASK_KEYSCAN
+#ifdef HAS_TASK_KEYSCAN
/**
* Return the key held down at boot time in addition to the keyboard-controlled
* reset keys. Returns BOOT_KEY_OTHER if none of the keys specifically checked
@@ -75,7 +75,7 @@ static inline enum boot_key keyboard_scan_get_boot_key(void)
*/
const uint8_t *keyboard_scan_get_state(void);
-#ifdef CONFIG_TASK_KEYSCAN
+#ifdef HAS_TASK_KEYSCAN
/**
* Enables/disables keyboard matrix scan.
*/