diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 01:28:08 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-19 01:28:08 (GMT) |
| commit | 29e7ee378e2327c808ede66dec4d4d964f4d375f (patch) | |
| tree | 4f904bfc485acd2ba5f7abdf43f57eeb8ce1dbdb /drivers/base/power/Makefile | |
| parent | fc15bc817eecd5c13581adab2a182c07edededa0 (diff) | |
| parent | 967e35dcc9ac194b4a6fad69a5a51f93d69bb0d1 (diff) | |
| download | linux-fsl-qoriq-29e7ee378e2327c808ede66dec4d4d964f4d375f.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
sysfs: cosmetic clean up on node creation failure paths
sysfs: kill an extra put in sysfs_create_link() failure path
Driver core: check return code of sysfs_create_link()
HOWTO: Add the knwon_regression URI to the documentation
dev_vdbg() documentation
dev_vdbg(), available with -DVERBOSE_DEBUG
sysfs: make sysfs_init_inode() static
sysfs: fix sysfs root inode nlink accounting
Documentation fix devres.txt: lib/iomap.c -> lib/devres.c
sysfs: avoid kmem_cache_free(NULL)
PM: remove deprecated dpm_runtime_* routines
PM: Remove deprecated sysfs files
Driver core: accept all valid action-strings in uevent-trigger
debugfs: remove rmdir() non-empty complaint
Diffstat (limited to 'drivers/base/power/Makefile')
| -rw-r--r-- | drivers/base/power/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile index 91f2309..fff1780 100644 --- a/drivers/base/power/Makefile +++ b/drivers/base/power/Makefile @@ -1,5 +1,5 @@ obj-y := shutdown.o -obj-$(CONFIG_PM) += main.o suspend.o resume.o runtime.o sysfs.o +obj-$(CONFIG_PM) += main.o suspend.o resume.o sysfs.o obj-$(CONFIG_PM_TRACE) += trace.o ifeq ($(CONFIG_DEBUG_DRIVER),y) |