summaryrefslogtreecommitdiff
path: root/include/linux/atmdev.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@nuts.davemloft.net>2004-10-25 07:28:00 -0700
committerDavid S. Miller <davem@nuts.davemloft.net>2004-10-25 07:28:00 -0700
commited639ad795a16f91accebd39d8252c6c8ebece6f (patch)
tree68930d6fc6a095747f1a48df26a5955e13b404dd /include/linux/atmdev.h
parentfad9fecf0816800107f1c7eaf01445eba5cad2b3 (diff)
parentf335c143218df5b29b9d55211e6a6141ce1b67fd (diff)
Merge bk://bk.skbuff.net:20610/linux-2.6-inet6-20041026/
into nuts.davemloft.net:/disk1/BK/net-2.6
Diffstat (limited to 'include/linux/atmdev.h')
-rw-r--r--include/linux/atmdev.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
index 268da2732958..87a901c75370 100644
--- a/include/linux/atmdev.h
+++ b/include/linux/atmdev.h
@@ -395,7 +395,6 @@ struct atm_dev *atm_dev_lookup(int number);
void atm_dev_deregister(struct atm_dev *dev);
void shutdown_atm_dev(struct atm_dev *dev);
void vcc_insert_socket(struct sock *sk);
-void vcc_remove_socket(struct sock *sk);
/*