diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 01:53:34 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 01:53:34 -0500 |
| commit | c170093d31bd4e3bc51881cc0f123beeca7872c9 (patch) | |
| tree | d93cd280d525dd339f33be010c75b7fd0bacd690 /include/linux/kernel.h | |
| parent | 557218e2d662574bc58d840fe116c7fd8d57aed8 (diff) | |
| parent | 78bba987bc025a7263248501b453476e77b93331 (diff) | |
Merge branch 'devicetree/merge' into spi/merge
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 5a9d9059520b..d07d8057e440 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -243,6 +243,8 @@ extern int test_taint(unsigned flag); | |||
| 243 | extern unsigned long get_taint(void); | 243 | extern unsigned long get_taint(void); |
| 244 | extern int root_mountflags; | 244 | extern int root_mountflags; |
| 245 | 245 | ||
| 246 | extern bool early_boot_irqs_disabled; | ||
| 247 | |||
| 246 | /* Values used for system_state */ | 248 | /* Values used for system_state */ |
| 247 | extern enum system_states { | 249 | extern enum system_states { |
| 248 | SYSTEM_BOOTING, | 250 | SYSTEM_BOOTING, |