projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'upstream-3.6-rc1' of git://git.infradead.org/linux-ubi
[deliverable/linux.git]
/
include
/
linux
/
kernel.h
diff --git
a/include/linux/kernel.h
b/include/linux/kernel.h
index e07f5e0c5df4400eb34ac0d89150003e512381b0..604382143bcfccd6772260ed56e16589800af83c 100644
(file)
--- a/
include/linux/kernel.h
+++ b/
include/linux/kernel.h
@@
-377,7
+377,6
@@
extern enum system_states {
SYSTEM_HALT,
SYSTEM_POWER_OFF,
SYSTEM_RESTART,
- SYSTEM_SUSPEND_DISK,
} system_state;
#define TAINT_PROPRIETARY_MODULE 0
This page took
0.025147 seconds
and
5
git commands to generate.