commit 4afbab7cf694713169001b01b4cfe7ba23768fae
author Avery Pennarun <apenwarr@gmail.com> Wed Dec 04 02:46:51 2013 -0500
committer Avery Pennarun <apenwarr@gmail.com> Wed Dec 04 02:46:51 2013 -0500
tree 085a0cf26f55b8523fa80a439c3e4e6c669c3ae9
parent 78bb4bfad176c7404cccf62188db812393609d5d
parent fa1aeb0a9fee53e6ad2350fac0aad916a9870b67

Merge commit 'fa1aeb0a9fee53e6ad2350fac0aad916a9870b67' into openbox

* commit 'fa1aeb0a9fee53e6ad2350fac0aad916a9870b67':
  Update Makefile.in to remove profile build.
  STORAGE_BOX package: don't include dart/oregano on x86_64 for now.
  Update DartVM makefile to also handle building for x86 architectures
  iperf3: don't build iperf3_profile (with -pg option).

configs/gfrg200_defconfig

diff --git a/configs/gfrg200_defconfig b/configs/gfrg200_defconfig
index d3c6cfc..52fe513 100644
--- a/configs/gfrg200_defconfig
+++ b/configs/gfrg200_defconfig
@@ -87,7 +87,6 @@
 BR2_PACKAGE_GOOGLE_NETWORK_BOX=y
 BR2_PACKAGE_GOOGLE_STORAGE_BOX=y
 BR2_PACKAGE_CATAWAMPUS=y
-BR2_PACKAGE_BCM_DRIVERS=y
 BR2_PACKAGE_BCM_DRIVER_MOCA2=y
 BR2_PACKAGE_MINDSPEED_DRIVERS=y
 BR2_PACKAGE_MINDSPEED_DRIVER_PFE=y

package/qualcomm_drivers/Config.in

diff --git a/package/qualcomm_drivers/Config.in b/package/qualcomm_drivers/Config.in
index e032e58..4616424 100644
--- a/package/qualcomm_drivers/Config.in
+++ b/package/qualcomm_drivers/Config.in
@@ -1,5 +1,6 @@
 menu "Qualcomm Drivers"
 	config BR2_PACKAGE_QUALCOMM_DRIVERS
 		bool "Enable Qualcomm drivers"
+		depends on !BR2_PACKAGE_GOOGLE_PLATFORM_ONLY
 		default n
 endmenu