diff options
author | Paul Mundt | 2010-12-20 16:40:51 +0100 |
---|---|---|
committer | Paul Mundt | 2010-12-20 16:40:51 +0100 |
commit | 8bcee1832d23869c2cdb6886ae5210b0143256f0 (patch) | |
tree | 9fac190248ed9ed10fe4e6f7b1b4cda8eaef7ddd /include/linux/node.h | |
parent | ARM: mach-shmobile: Bump up NR_IRQS to 1024 (diff) | |
parent | ARM: mach-shmobile: INTC interrupt priority level demux fix (diff) | |
download | kernel-qcow2-linux-8bcee1832d23869c2cdb6886ae5210b0143256f0.tar.gz kernel-qcow2-linux-8bcee1832d23869c2cdb6886ae5210b0143256f0.tar.xz kernel-qcow2-linux-8bcee1832d23869c2cdb6886ae5210b0143256f0.zip |
Merge branch 'rmobile/urgent' into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/include/mach/entry-macro.S
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'include/linux/node.h')
-rw-r--r-- | include/linux/node.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/node.h b/include/linux/node.h index 06292dac3eab..1466945cc9ef 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_ |