summaryrefslogtreecommitdiffstats
path: root/include/linux/device.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-22 10:58:05 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-22 10:58:05 -0800
commit8b4b6707ee32f929846d947d18b1b9bf42e988aa (patch)
treeaa27dd01e2d74cb68efc4ab57eb4d1f4e563ae33 /include/linux/device.h
parentd04ef3a795b3b7b376a02713ed5e211e9ae1f917 (diff)
parent116f232b3794a8b6ebde21aef5004b18cc1cfa86 (diff)
downloadtalos-obmc-linux-8b4b6707ee32f929846d947d18b1b9bf42e988aa.tar.gz
talos-obmc-linux-8b4b6707ee32f929846d947d18b1b9bf42e988aa.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: fixed path to moved file in include/linux/device.h Fix spelling in E1000_DISABLE_PACKET_SPLIT Kconfig description Documentation/dvb/get_dvb_firmware: fix firmware URL Documentation: Update to BUG-HUNTING Remove superfluous NOTIFY_COOKIE_LEN define add "tags" to .gitignore Fix "frist", "fisrt", typos fix rwlock usage example It's UTF-8
Diffstat (limited to 'include/linux/device.h')
-rw-r--r--include/linux/device.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/device.h b/include/linux/device.h
index 6d2345d86082..f6e72a65a3f2 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -400,7 +400,7 @@ extern struct device * get_device(struct device * dev);
extern void put_device(struct device * dev);
-/* drivers/base/power.c */
+/* drivers/base/power/shutdown.c */
extern void device_shutdown(void);
OpenPOWER on IntegriCloud