diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-11 00:13:28 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-03-11 00:13:28 -0800 |
| commit | 85298808617299fe713ed3e03114058883ce3d8a (patch) | |
| tree | dcfbc74842eb8c0100e0e4444019a4834097041a | |
| parent | 46552bf4337b99322c0cc65f6003e59b7f36bf15 (diff) | |
| parent | 69eb1596b4df8ca834ba6f9a3df40f78943f6dca (diff) | |
| download | linux-85298808617299fe713ed3e03114058883ce3d8a.tar.gz linux-85298808617299fe713ed3e03114058883ce3d8a.tar.bz2 linux-85298808617299fe713ed3e03114058883ce3d8a.zip | |
Merge tag 'staging-4.11-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/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
| -rw-r--r-- | drivers/staging/octeon/ethernet-rx.c | 1 | ||||
| -rw-r--r-- | drivers/staging/vc04_services/Kconfig | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c index 7f8cf875157c..65a285631994 100644 --- a/drivers/staging/octeon/ethernet-rx.c +++ b/drivers/staging/octeon/ethernet-rx.c @@ -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 diff --git a/drivers/staging/vc04_services/Kconfig b/drivers/staging/vc04_services/Kconfig index e61e4ca064a8..74094fff4367 100644 --- a/drivers/staging/vc04_services/Kconfig +++ b/drivers/staging/vc04_services/Kconfig @@ -1,6 +1,7 @@ config BCM2835_VCHIQ tristate "Videocore VCHIQ" depends on HAS_DMA + depends on OF depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE) default y help |