aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2013-02-01 11:08:24 +0100
committerGerd Hoffmann <kraxel@redhat.com>2013-02-19 12:30:04 +0100
commit07d17e772095ee2b1171498536e5671a97920149 (patch)
tree41111139434bc2cb7b7a22bcddbe27531e46cd17
parent6c83f81542e4fda1777a74e4647a69086e44357c (diff)
downloadqemu-arm-07d17e772095ee2b1171498536e5671a97920149.tar.gz
allow disabling usb smartcard support
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--hw/Makefile.objs2
-rw-r--r--hw/usb/Makefile.objs1
2 files changed, 2 insertions, 1 deletions
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 447e32a42e..a1f3a808ac 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -38,8 +38,10 @@ common-obj-$(CONFIG_DMA) += dma.o
common-obj-$(CONFIG_I82374) += i82374.o
common-obj-$(CONFIG_HPET) += hpet.o
common-obj-$(CONFIG_APPLESMC) += applesmc.o
+ifeq ($(CONFIG_USB_SMARTCARD),y)
common-obj-y += ccid-card-passthru.o
common-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o
+endif
common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o
common-obj-y += fifo.o
common-obj-y += pam.o
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
index 00998b5073..c1e40d7d31 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -20,7 +20,6 @@ common-obj-$(CONFIG_USB_NETWORK) += dev-network.o
# FIXME: make configurable too
CONFIG_USB_BLUETOOTH := y
-CONFIG_USB_SMARTCARD := y
common-obj-$(CONFIG_USB_BLUETOOTH) += dev-bluetooth.o
common-obj-$(CONFIG_USB_SMARTCARD) += dev-smartcard-reader.o