aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/w1/w1_int.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-22 13:41:59 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-22 13:41:59 -0400
commita0cd30fd26a398c0c6e50c6760610d4529f17a84 (patch)
tree00c02a25966468706adf9a1d035c08f71baa6078 /drivers/w1/w1_int.h
parent94eb7f4cefaf3ed8e97504ce4f3946bdb908e501 (diff)
parente5c515b4532f4aac2b1136612d8c3ecd1891f431 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/w1-2.6
Diffstat (limited to 'drivers/w1/w1_int.h')
-rw-r--r--drivers/w1/w1_int.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/w1/w1_int.h b/drivers/w1/w1_int.h
index fdb531e87faa..4274082d2262 100644
--- a/drivers/w1/w1_int.h
+++ b/drivers/w1/w1_int.h
@@ -1,8 +1,8 @@
1/* 1/*
2 * w1_int.h 2 * w1_int.h
3 * 3 *
4 * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru> 4 * Copyright (c) 2004 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
5 * 5 *
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify 7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License as published by 8 * it under the terms of the GNU General Public License as published by
@@ -27,8 +27,6 @@
27 27
28#include "w1.h" 28#include "w1.h"
29 29
30struct w1_master * w1_alloc_dev(u32, int, int, struct device_driver *, struct device *);
31void w1_free_dev(struct w1_master *dev);
32int w1_add_master_device(struct w1_bus_master *); 30int w1_add_master_device(struct w1_bus_master *);
33void w1_remove_master_device(struct w1_bus_master *); 31void w1_remove_master_device(struct w1_bus_master *);
34void __w1_remove_master_device(struct w1_master *); 32void __w1_remove_master_device(struct w1_master *);