diff options
Diffstat (limited to 'arch/um/drivers')
-rw-r--r-- | arch/um/drivers/net_kern.c | 6 | ||||
-rw-r--r-- | arch/um/drivers/slip_kern.c | 4 | ||||
-rw-r--r-- | arch/um/drivers/stdio_console.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c index 1d43bdfc20c4..5b4ca8d93682 100644 --- a/arch/um/drivers/net_kern.c +++ b/arch/um/drivers/net_kern.c | |||
@@ -116,7 +116,7 @@ static void uml_dev_close(struct work_struct *work) | |||
116 | dev_close(lp->dev); | 116 | dev_close(lp->dev); |
117 | } | 117 | } |
118 | 118 | ||
119 | irqreturn_t uml_net_interrupt(int irq, void *dev_id) | 119 | static irqreturn_t uml_net_interrupt(int irq, void *dev_id) |
120 | { | 120 | { |
121 | struct net_device *dev = dev_id; | 121 | struct net_device *dev = dev_id; |
122 | struct uml_net_private *lp = dev->priv; | 122 | struct uml_net_private *lp = dev->priv; |
@@ -296,7 +296,7 @@ static struct ethtool_ops uml_net_ethtool_ops = { | |||
296 | .get_link = ethtool_op_get_link, | 296 | .get_link = ethtool_op_get_link, |
297 | }; | 297 | }; |
298 | 298 | ||
299 | void uml_net_user_timer_expire(unsigned long _conn) | 299 | static void uml_net_user_timer_expire(unsigned long _conn) |
300 | { | 300 | { |
301 | #ifdef undef | 301 | #ifdef undef |
302 | struct connection *conn = (struct connection *)_conn; | 302 | struct connection *conn = (struct connection *)_conn; |
@@ -786,7 +786,7 @@ static int uml_inetaddr_event(struct notifier_block *this, unsigned long event, | |||
786 | } | 786 | } |
787 | 787 | ||
788 | /* uml_net_init shouldn't be called twice on two CPUs at the same time */ | 788 | /* uml_net_init shouldn't be called twice on two CPUs at the same time */ |
789 | struct notifier_block uml_inetaddr_notifier = { | 789 | static struct notifier_block uml_inetaddr_notifier = { |
790 | .notifier_call = uml_inetaddr_event, | 790 | .notifier_call = uml_inetaddr_event, |
791 | }; | 791 | }; |
792 | 792 | ||
diff --git a/arch/um/drivers/slip_kern.c b/arch/um/drivers/slip_kern.c index 6b4a0f9e38de..d19faec7046e 100644 --- a/arch/um/drivers/slip_kern.c +++ b/arch/um/drivers/slip_kern.c | |||
@@ -13,7 +13,7 @@ struct slip_init { | |||
13 | char *gate_addr; | 13 | char *gate_addr; |
14 | }; | 14 | }; |
15 | 15 | ||
16 | void slip_init(struct net_device *dev, void *data) | 16 | static void slip_init(struct net_device *dev, void *data) |
17 | { | 17 | { |
18 | struct uml_net_private *private; | 18 | struct uml_net_private *private; |
19 | struct slip_data *spri; | 19 | struct slip_data *spri; |
@@ -57,7 +57,7 @@ static int slip_write(int fd, struct sk_buff *skb, struct uml_net_private *lp) | |||
57 | (struct slip_data *) &lp->user); | 57 | (struct slip_data *) &lp->user); |
58 | } | 58 | } |
59 | 59 | ||
60 | const struct net_kern_info slip_kern_info = { | 60 | static const struct net_kern_info slip_kern_info = { |
61 | .init = slip_init, | 61 | .init = slip_init, |
62 | .protocol = slip_protocol, | 62 | .protocol = slip_protocol, |
63 | .read = slip_read, | 63 | .read = slip_read, |
diff --git a/arch/um/drivers/stdio_console.c b/arch/um/drivers/stdio_console.c index cec0c33cdd39..49266f6108c4 100644 --- a/arch/um/drivers/stdio_console.c +++ b/arch/um/drivers/stdio_console.c | |||
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | static struct tty_driver *console_driver; | 35 | static struct tty_driver *console_driver; |
36 | 36 | ||
37 | void stdio_announce(char *dev_name, int dev) | 37 | static void stdio_announce(char *dev_name, int dev) |
38 | { | 38 | { |
39 | printk(KERN_INFO "Virtual console %d assigned device '%s'\n", dev, | 39 | printk(KERN_INFO "Virtual console %d assigned device '%s'\n", dev, |
40 | dev_name); | 40 | dev_name); |
@@ -158,7 +158,7 @@ static struct console stdiocons = { | |||
158 | .index = -1, | 158 | .index = -1, |
159 | }; | 159 | }; |
160 | 160 | ||
161 | int stdio_init(void) | 161 | static int stdio_init(void) |
162 | { | 162 | { |
163 | char *new_title; | 163 | char *new_title; |
164 | 164 | ||