diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-09-24 17:04:31 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-09-24 17:04:31 +0100 |
| commit | 9438fe9e56760e5e5e11d6c7d12ed9c64a0c8446 (patch) | |
| tree | bb91f03e1bb65f7d48d9f6c927a87ce53d6d510a /hw | |
| parent | eb9d0ea063fc7bdfab76b84085602a9e48d13ec7 (diff) | |
| parent | 7b02f5447c64d1854468f758398c9f6fe9e5721f (diff) | |
Merge remote-tracking branch 'remotes/elmarco/tags/rm-libcacard' into staging
Remove libcacard
# gpg: Signature made Wed 23 Sep 2015 22:37:11 BST using RSA key ID 75969CE5
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>"
# gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5
* remotes/elmarco/tags/rm-libcacard:
libcacard: use the standalone project
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/usb/Makefile.objs | 5 | ||||
| -rw-r--r-- | hw/usb/ccid-card-passthru.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs index 7443e386b3..8f00fbd8f6 100644 --- a/hw/usb/Makefile.objs +++ b/hw/usb/Makefile.objs @@ -23,9 +23,8 @@ common-obj-$(CONFIG_USB_BLUETOOTH) += dev-bluetooth.o ifeq ($(CONFIG_USB_SMARTCARD),y) common-obj-y += dev-smartcard-reader.o -common-obj-y += ccid-card-passthru.o -common-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o -ccid-card-emulated.o-cflags := -I$(SRC_PATH)/libcacard +common-obj-$(CONFIG_SMARTCARD) += ccid-card-passthru.o +common-obj-$(CONFIG_SMARTCARD) += ccid-card-emulated.o endif ifeq ($(CONFIG_POSIX),y) diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c index 85a4fc3e53..9f49c0537f 100644 --- a/hw/usb/ccid-card-passthru.c +++ b/hw/usb/ccid-card-passthru.c @@ -12,7 +12,7 @@ #include "qemu/error-report.h" #include "qemu/sockets.h" #include "ccid.h" -#include "libcacard/vscard_common.h" +#include "cacard/vscard_common.h" #define DPRINTF(card, lvl, fmt, ...) \ do { \ |