Cong Wang
dfcefb0be1
net: fix a compile error when CONFIG_NET_LL_RX_POLL is not set ...
When CONFIG_NET_LL_RX_POLL is not set, I got:
net/socket.c: In function ‘sock_poll’:
net/socket.c:1165:4: error: implicit declaration of function ‘sk_busy_loop’ [-Werror=implicit-function-declaration]
Fix this by adding a nop when !CONFIG_NET_LL_RX_POLL.
Cc: Eliezer Tamir <eliezer.tamir@linux.intel.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2013-08-01 15:10:58 -07:00
Revert "ACPI / video / i915: No ACPI backlight if firmware expects Windows 8"
2013-07-26 14:59:20 +02:00
Merge branch 'cpuinit-delete' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2013-07-07 11:01:19 -07:00
drm/cma: remove GEM CMA specific dma_buf functionality
2013-07-05 15:44:54 +10:00
Pin control fixes for the v3.11 series:
2013-07-28 18:19:27 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2013-07-31 12:56:18 -07:00
[media] exynos4-is: Correct colorspace handling at FIMC-LITE
2013-06-28 15:33:27 -03:00
net: fix a compile error when CONFIG_NET_LL_RX_POLL is not set
2013-08-01 15:10:58 -07:00
Merge branches 'af_ib', 'cxgb4', 'misc', 'mlx5', 'ocrdma', 'qib' and 'srp' into for-next
2013-07-08 11:22:11 -07:00
ASoC: More updates for v3.11
2013-06-28 13:36:22 +02:00
target: make queue_tm_rsp() return void
2013-07-07 18:36:53 -07:00
This contains fixes, optimizations and some clean ups
2013-07-22 19:07:24 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
2013-08-01 14:30:59 -04:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-07-09 16:04:31 -07:00
Merge branch 'for-3.11/drivers' of git://git.kernel.dk/linux-block
2013-07-22 19:02:52 -07:00
dfcefb0be1