summaryrefslogtreecommitdiffstats
path: root/arch/um/drivers/pcap_user.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-10-11 03:56:12 -0400
committerJeff Garzik <jeff@garzik.org>2006-10-11 03:56:12 -0400
commit24fcbacedb0d83cabc6761acbecfbf751265ce52 (patch)
tree7147b206304b028c3cfd5de6317e5c8510098ca9 /arch/um/drivers/pcap_user.h
parent2f614fe04f4463ff22234133319067d7361f54e5 (diff)
parent53a5fbdc2dff55161a206ed1a1385a8fa8055c34 (diff)
downloadop-kernel-dev-24fcbacedb0d83cabc6761acbecfbf751265ce52.zip
op-kernel-dev-24fcbacedb0d83cabc6761acbecfbf751265ce52.tar.gz
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'arch/um/drivers/pcap_user.h')
-rw-r--r--arch/um/drivers/pcap_user.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/pcap_user.h b/arch/um/drivers/pcap_user.h
index 58f9f6a..96b80b5 100644
--- a/arch/um/drivers/pcap_user.h
+++ b/arch/um/drivers/pcap_user.h
@@ -15,7 +15,7 @@ struct pcap_data {
void *dev;
};
-extern struct net_user_info pcap_user_info;
+extern const struct net_user_info pcap_user_info;
extern int pcap_user_read(int fd, void *buf, int len, struct pcap_data *pri);
OpenPOWER on IntegriCloud