aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-02 12:58:36 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-02 12:58:36 -0800
commit8733cb29d60fd2ca6c1f50f69f9b90fbfcd1879b (patch)
treee6bef80539d3ada338f3f72733253b995df7e5c7 /include
parenteed5ee1a3ab3020168cd67fdde2500452b0628c9 (diff)
parent318af55ddd38bdaaa2b57f5c3bd394f3ce3a2610 (diff)
downloadmrst-s0i3-test-8733cb29d60fd2ca6c1f50f69f9b90fbfcd1879b.tar.gz
mrst-s0i3-test-8733cb29d60fd2ca6c1f50f69f9b90fbfcd1879b.tar.xz
mrst-s0i3-test-8733cb29d60fd2ca6c1f50f69f9b90fbfcd1879b.zip
Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: uio: Change mail address of Hans J. Koch driver core: prune docs about device_interface driver core: the development tree has switched to git
Diffstat (limited to 'include')
-rw-r--r--include/linux/cpu.h5
-rw-r--r--include/linux/node.h5
-rw-r--r--include/linux/uio_driver.h2
3 files changed, 1 insertions, 11 deletions
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 4823af64e9d..5f09323ee88 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -10,11 +10,6 @@
*
* CPUs are exported via sysfs in the class/cpu/devices/
* directory.
- *
- * Per-cpu interfaces can be implemented using a struct device_interface.
- * See the following for how to do this:
- * - drivers/base/intf.c
- * - Documentation/driver-model/interface.txt
*/
#ifndef _LINUX_CPU_H_
#define _LINUX_CPU_H_
diff --git a/include/linux/node.h b/include/linux/node.h
index 06292dac3ea..1466945cc9e 100644
--- a/include/linux/node.h
+++ b/include/linux/node.h
@@ -10,11 +10,6 @@
*
* Nodes are exported via driverfs in the class/node/devices/
* directory.
- *
- * Per-node interfaces can be implemented using a struct device_interface.
- * See the following for how to do this:
- * - drivers/base/intf.c
- * - Documentation/driver-model/interface.txt
*/
#ifndef _LINUX_NODE_H_
#define _LINUX_NODE_H_
diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
index d6188e5a52d..665517c05ea 100644
--- a/include/linux/uio_driver.h
+++ b/include/linux/uio_driver.h
@@ -3,7 +3,7 @@
*
* Copyright(C) 2005, Benedikt Spranger <b.spranger@linutronix.de>
* Copyright(C) 2005, Thomas Gleixner <tglx@linutronix.de>
- * Copyright(C) 2006, Hans J. Koch <hjk@linutronix.de>
+ * Copyright(C) 2006, Hans J. Koch <hjk@hansjkoch.de>
* Copyright(C) 2006, Greg Kroah-Hartman <greg@kroah.com>
*
* Userspace IO driver.