diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 17:25:57 +0200 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-27 17:25:57 +0200 |
commit | 50cb993ea6cd187bfed085cb3e0747066edeb02f (patch) | |
tree | 61edac62c6c5bc07c59e4369c50c6821ad77f2c0 /arch/frv/kernel/pm.c | |
parent | V4L/DVB (8534): remove select's of FW_LOADER (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
download | linux-50cb993ea6cd187bfed085cb3e0747066edeb02f.tar.xz linux-50cb993ea6cd187bfed085cb3e0747066edeb02f.zip |
Merge ../linux-2.6
Diffstat (limited to 'arch/frv/kernel/pm.c')
-rw-r--r-- | arch/frv/kernel/pm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/frv/kernel/pm.c b/arch/frv/kernel/pm.c index 73f3aeefd203..d1113c5031f5 100644 --- a/arch/frv/kernel/pm.c +++ b/arch/frv/kernel/pm.c @@ -14,7 +14,6 @@ #include <linux/init.h> #include <linux/module.h> #include <linux/pm.h> -#include <linux/pm_legacy.h> #include <linux/sched.h> #include <linux/interrupt.h> #include <linux/sysctl.h> |