diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-07-02 06:34:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-07-02 06:34:04 -0700 |
| commit | faa7a4c05ace72d85bbfb8d2a458a80491f8045b (patch) | |
| tree | 360c5cb33ba4e4c762d0052af0c0e856d592328a /include/linux/pm.h | |
| parent | 62054d49783cfe93c9cee9d90a0779f1f9054968 (diff) | |
| parent | 9da9210dbc752cf35fa2fe866614a1d5b1266066 (diff) | |
Merge bk://linux-ntfs.bkbits.net/ntfs-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux/pm.h')
| -rw-r--r-- | include/linux/pm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index 66e62c0df19c..d54bc441daff 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -159,7 +159,7 @@ static inline struct pm_dev *pm_register(pm_dev_t type, unsigned long id, pm_callback callback) { - return 0; + return NULL; } static inline void pm_unregister(struct pm_dev *dev) {} |