Commit babbe60a authored by Linus Torvalds's avatar Linus Torvalds

Automerge

parents 126fb686 0ceeaa7b
...@@ -57,7 +57,7 @@ if [ "$CONFIG_IT8712" = "y" ]; then ...@@ -57,7 +57,7 @@ if [ "$CONFIG_IT8712" = "y" ]; then
bool 'Enable Qtronix 990P Keyboard Support' CONFIG_QTRONIX_KEYBOARD bool 'Enable Qtronix 990P Keyboard Support' CONFIG_QTRONIX_KEYBOARD
if [ "$CONFIG_QTRONIX_KEYBOARD" = "y" ]; then if [ "$CONFIG_QTRONIX_KEYBOARD" = "y" ]; then
define_bool CONFIG_IT8172_CIR y define_bool CONFIG_IT8172_CIR y
else fi
bool 'Enable Smart Card Reader 0 Support ' CONFIG_IT8172_SCR0 bool 'Enable Smart Card Reader 0 Support ' CONFIG_IT8172_SCR0
bool 'Enable Smart Card Reader 1 Support ' CONFIG_IT8172_SCR1 bool 'Enable Smart Card Reader 1 Support ' CONFIG_IT8172_SCR1
fi fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment