release-request-63504342-e033-4b9f-9c68-68bdd28fdc7c-for-git_oc-mr1-release-4054002...

Change-Id: Ie9119bb4acdbde297159e27a239819163f8f0d22

diff --git a/.config b/.config
index b171bef..d57ec7a 100644 (file)
--- a/.config
+++ b/.config
@@ -165,8 +165,8 @@ CONFIG_LSATTR=y
 CONFIG_LS_COLOR=y
 CONFIG_LSMOD=y
 CONFIG_LSOF=y
-# CONFIG_LSPCI is not set
-CONFIG_LSPCI_TEXT=y
+CONFIG_LSPCI=y
+# CONFIG_LSPCI_TEXT is not set
 CONFIG_LSUSB=y
 CONFIG_LS=y
 CONFIG_LS_Z=y

diff --git a/Android.mk b/Android.mk
index 82f01f7..971d873 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -105,6 +105,7 @@ common_SRC_FILES := \
     toys/other/losetup.c \
     toys/other/lsattr.c \
     toys/other/lsmod.c \
+    toys/other/lspci.c \
     toys/other/lsusb.c \
     toys/other/makedevs.c \
     toys/other/mkswap.c \
@@ -298,6 +299,7 @@ ALL_TOOLS := \
     ls \
     lsmod \
     lsof \
+    lspci \
     lsusb \
     md5sum \
     mkdir \

diff --git a/generated/config.h b/generated/config.h
index dbdfaf1..e6f9354 100644 (file)
--- a/generated/config.h
+++ b/generated/config.h
@@ -304,10 +304,10 @@
 #define USE_LSMOD(...) __VA_ARGS__
 #define CFG_LSOF 1
 #define USE_LSOF(...) __VA_ARGS__
-#define CFG_LSPCI 0
-#define USE_LSPCI(...)
-#define CFG_LSPCI_TEXT 1
-#define USE_LSPCI_TEXT(...) __VA_ARGS__
+#define CFG_LSPCI 1
+#define USE_LSPCI(...) __VA_ARGS__
+#define CFG_LSPCI_TEXT 0
+#define USE_LSPCI_TEXT(...)
 #define CFG_LSUSB 1
 #define USE_LSUSB(...) __VA_ARGS__
 #define CFG_LS 1