1. 23 6月, 2010 2 次提交
    • R
      Input: fixup X86_MRST selects · 0b28bac5
      Randy Dunlap 提交于
      Some of the recent X86_MRST additions make some "select"s
      conditional on X86_MRST but missed some related kconfig symbols,
      causing:
      
      drivers/built-in.o: In function `ps2_end_command':
      (.text+0x257ab2): undefined reference to `i8042_check_port_owner'
      drivers/built-in.o: In function `ps2_end_command':
      (.text+0x257ae1): undefined reference to `i8042_unlock_chip'
      drivers/built-in.o: In function `ps2_begin_command':
      (.text+0x257b40): undefined reference to `i8042_check_port_owner'
      drivers/built-in.o: In function `ps2_begin_command':
      (.text+0x257b6f): undefined reference to `i8042_lock_chip'
      
      when SERIO_I8042=m, SERIO_LIBPS2=y, KEYBOARD_ATKBD=y.
      
      We need to make i8042 dependant upon !X86_MRST and allow deselecting
      atkbd on Moorestown even when !CONFIG_EMBEDDED.
      Signed-off-by: NRandy Dunlap <randy.dunlap@oracle.com>
      Cc: Jacob Pan <jacob.jun.pan@intel.com>
      Signed-off-by: NDmitry Torokhov <dtor@mail.ru>
      0b28bac5
    • D
      Merge commit 'v2.6.35-rc3' into for-linus · 0e789314
      Dmitry Torokhov 提交于
      0e789314
  2. 12 6月, 2010 27 次提交
  3. 11 6月, 2010 11 次提交