1. 04 5月, 2013 2 次提交
  2. 30 4月, 2013 1 次提交
    • J
      Merge tag 'nfc-next-3.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next · a8a48e60
      John W. Linville 提交于
      Samuel Ortiz <sameo@linux.intel.com> says:
      
      "With this one we have:
      
      - One patch for moving the LLCP code into net/nfc.
        It fixes a build annoyance reported by Dave Miller caused by the fact
        that the LLCP code object targets are not in the same directory as the
        Makefile trying to build them is. It prevents us from doing e.g.
      
              make net/nfc/llcp/sock.o
      
        Moving the LLCP code into net/nfc and not making it optional anymore
        makes sense as LLCP is a fundamental piece of the NFC specifications
        and thus should be in the core NFC directory.
      
      - One patch that fixes the missing dependency against RFKILL. Without it NFC
        fails to properly build when it's builtin and CONFIG_RFKILL=m."
      Signed-off-by: NJohn W. Linville <linville@tuxdriver.com>
      a8a48e60
  3. 27 4月, 2013 1 次提交
    • M
      NFC: Add missing RFKILL dependency for Kconfig · c204ea09
      Marcel Holtmann 提交于
      Since the NFC subsystem gained RFKILL support, it needs to be able
      to build properly with whatever option for RFKILL has been selected.
      
      on i386:
      
      net/built-in.o: In function `nfc_unregister_device':
      (.text+0x6a36d): undefined reference to `rfkill_unregister'
      net/built-in.o: In function `nfc_unregister_device':
      (.text+0x6a378): undefined reference to `rfkill_destroy'
      net/built-in.o: In function `nfc_register_device':
      (.text+0x6a493): undefined reference to `rfkill_alloc'
      net/built-in.o: In function `nfc_register_device':
      (.text+0x6a4a4): undefined reference to `rfkill_register'
      net/built-in.o: In function `nfc_register_device':
      (.text+0x6a4b3): undefined reference to `rfkill_destroy'
      net/built-in.o: In function `nfc_dev_up':
      (.text+0x6a8e8): undefined reference to `rfkill_blocked'
      
      when CONFIG_RFKILL=m but NFC is builtin.
      Reported-by: NRandy Dunlap <rdunlap@infradead.org>
      Acked-by: NRandy Dunlap <rdunlap@infradead.org>
      Signed-off-by: NMarcel Holtmann <marcel@holtmann.org>
      Signed-off-by: NSamuel Ortiz <sameo@linux.intel.com>
      c204ea09
  4. 26 4月, 2013 10 次提交
  5. 24 4月, 2013 24 次提交
  6. 23 4月, 2013 2 次提交