diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-12-07 16:35:17 -0500 |
| commit | 21b4e736922f546e0f1aa7b9d6c442f309a2444a (patch) | |
| tree | e1be8645297f8ebe87445251743ebcc52081a20d /include/asm-arm26/setup.h | |
| parent | 34161db6b14d984fb9b06c735b7b42f8803f6851 (diff) | |
| parent | 68380b581383c028830f79ec2670f4a193854aa6 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
Diffstat (limited to 'include/asm-arm26/setup.h')
| -rw-r--r-- | include/asm-arm26/setup.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-arm26/setup.h b/include/asm-arm26/setup.h index 6348931be65d..1a867b4e8d53 100644 --- a/include/asm-arm26/setup.h +++ b/include/asm-arm26/setup.h | |||
| @@ -16,6 +16,8 @@ | |||
| 16 | 16 | ||
| 17 | #define COMMAND_LINE_SIZE 1024 | 17 | #define COMMAND_LINE_SIZE 1024 |
| 18 | 18 | ||
| 19 | #ifdef __KERNEL__ | ||
| 20 | |||
| 19 | /* The list ends with an ATAG_NONE node. */ | 21 | /* The list ends with an ATAG_NONE node. */ |
| 20 | #define ATAG_NONE 0x00000000 | 22 | #define ATAG_NONE 0x00000000 |
| 21 | 23 | ||
| @@ -202,4 +204,6 @@ struct meminfo { | |||
| 202 | 204 | ||
| 203 | extern struct meminfo meminfo; | 205 | extern struct meminfo meminfo; |
| 204 | 206 | ||
| 207 | #endif /* __KERNEL__ */ | ||
| 208 | |||
| 205 | #endif | 209 | #endif |