aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wan/z85230.c1
-rw-r--r--include/linux/netdevice.h1
-rw-r--r--include/net/sock.h1
3 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
index ccd9cd35ecbe..5bf7e01ef0e9 100644
--- a/drivers/net/wan/z85230.c
+++ b/drivers/net/wan/z85230.c
@@ -695,7 +695,6 @@ EXPORT_SYMBOL(z8530_nop);
695 * z8530_interrupt - Handle an interrupt from a Z8530 695 * z8530_interrupt - Handle an interrupt from a Z8530
696 * @irq: Interrupt number 696 * @irq: Interrupt number
697 * @dev_id: The Z8530 device that is interrupting. 697 * @dev_id: The Z8530 device that is interrupting.
698 * @regs: unused
699 * 698 *
700 * A Z85[2]30 device has stuck its hand in the air for attention. 699 * A Z85[2]30 device has stuck its hand in the air for attention.
701 * We scan both the channels on the chip for events and then call 700 * We scan both the channels on the chip for events and then call
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index c8bcb59adfdf..9d77b1d7dca8 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1537,7 +1537,6 @@ static inline void __netif_tx_unlock_bh(struct netdev_queue *txq)
1537/** 1537/**
1538 * netif_tx_lock - grab network device transmit lock 1538 * netif_tx_lock - grab network device transmit lock
1539 * @dev: network device 1539 * @dev: network device
1540 * @cpu: cpu number of lock owner
1541 * 1540 *
1542 * Get network device transmit lock 1541 * Get network device transmit lock
1543 */ 1542 */
diff --git a/include/net/sock.h b/include/net/sock.h
index ada50c04d09f..c04f9e18ea22 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -936,7 +936,6 @@ extern void sock_init_data(struct socket *sock, struct sock *sk);
936 936
937/** 937/**
938 * sk_filter_release: Release a socket filter 938 * sk_filter_release: Release a socket filter
939 * @sk: socket
940 * @fp: filter to remove 939 * @fp: filter to remove
941 * 940 *
942 * Remove a filter from a socket and release its resources. 941 * Remove a filter from a socket and release its resources.