Commit 85298808 authored Mar 11, 2017 by Linus Torvalds

staging

Pull staging driver fixes from Greg KH:
 "Here are two small build warning fixes for some staging drivers that
  Arnd has found on his valiant quest to get the kernel to build
  properly with no warnings.

  Both of these have been in linux-next this week and resolve the
  reported issues"

* tag 'staging-4.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: octeon: remove unused variable
  staging/vc04_services: add CONFIG_OF dependency

parents 46552bf4 69eb1596

drivers/staging/octeon/ethernet-rx.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -336,7 +336,6 @@ static int cvm_oct_poll(struct oct_rx_group *rx_group, int budget)
		if (likely((port < TOTAL_NUMBER_OF_PORTS) &&
		cvm_oct_device[port])) {
		struct net_device *dev = cvm_oct_device[port];
		struct octeon_ethernet *priv = netdev_priv(dev);

		/*
		* Only accept packets for devices that are

drivers/staging/vc04_services/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		config BCM2835_VCHIQ
		tristate "Videocore VCHIQ"
		depends on HAS_DMA
		depends on OF
		depends on RASPBERRYPI_FIRMWARE \|\| (COMPILE_TEST && !RASPBERRYPI_FIRMWARE)
		default y
		help