Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / scripts / config_whitelist.txt

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 80927d614b66d54fafdf75966bcb123f7b5ba37c..78bcf06878b96ec49a4a5e9450efb85b8b1005a3 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1847,7 +1847,6 @@ CONFIG_RAMDISK_ADDR
 CONFIG_RAMDISK_BOOT
 CONFIG_RAM_BOOT
 CONFIG_RAM_BOOT_PHYS
-CONFIG_RANDOM_UUID
 CONFIG_RCAR_BOARD_STRING
 CONFIG_RD_LVL
 CONFIG_REALMODE_DEBUG
@@ -4973,7 +4972,6 @@ CONFIG_USBD_SERIAL_OUT_PKTSIZE
 CONFIG_USBD_VENDORID
 CONFIG_USBID_ADDR
 CONFIG_USBNET_DEV_ADDR
-CONFIG_USBNET_MANUFACTURER
 CONFIG_USBTTY
 CONFIG_USB_AM35X
 CONFIG_USB_ATMEL