git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
drivers
/
w1
/
slaves
/
w1_smem.c
diff --git
a/drivers/w1/w1_smem.c
b/drivers/w1/slaves/w1_smem.c
similarity index 95%
rename from
drivers/w1/w1_smem.c
rename to
drivers/w1/slaves/w1_smem.c
index
e3209d0
..
cc8c02e
100644
(file)
--- a/
drivers/w1/w1_smem.c
+++ b/
drivers/w1/slaves/w1_smem.c
@@
-27,10
+27,9
@@
#include <linux/device.h>
#include <linux/types.h>
#include <linux/device.h>
#include <linux/types.h>
-#include "w1.h"
-#include "w1_io.h"
-#include "w1_int.h"
-#include "w1_family.h"
+#include "../w1.h"
+#include "../w1_int.h"
+#include "../w1_family.h"
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Evgeniy Polyakov <johnpol@2ka.mipt.ru>");
@@
-51,7
+50,7
@@
static int __init w1_smem_init(void)
err = w1_register_family(&w1_smem_family_01);
if (err)
return err;
err = w1_register_family(&w1_smem_family_01);
if (err)
return err;
-
+
err = w1_register_family(&w1_smem_family_81);
if (err) {
w1_unregister_family(&w1_smem_family_01);
err = w1_register_family(&w1_smem_family_81);
if (err) {
w1_unregister_family(&w1_smem_family_01);