diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-07-18 20:38:57 -0400 |
| commit | 1ff8392c32a2645d2665ca779ecb91bb29361c13 (patch) | |
| tree | 860b95e9a499ade4060848740fc6ce1fbb4e4e8d /include/linux/edd.h | |
| parent | 70b315b0dd3879cb3ab8aadffb14f10b2d19b9c3 (diff) | |
| parent | 5bae7ac9feba925fd0099057f6b23d7be80b7b41 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/export.c
Diffstat (limited to 'include/linux/edd.h')
| -rw-r--r-- | include/linux/edd.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/edd.h b/include/linux/edd.h index b2b3e68aa512..7b647822d6dc 100644 --- a/include/linux/edd.h +++ b/include/linux/edd.h | |||
| @@ -49,10 +49,6 @@ | |||
| 49 | #define EDD_MBR_SIG_MAX 16 /* max number of signatures to store */ | 49 | #define EDD_MBR_SIG_MAX 16 /* max number of signatures to store */ |
| 50 | #define EDD_MBR_SIG_NR_BUF 0x1ea /* addr of number of MBR signtaures at EDD_MBR_SIG_BUF | 50 | #define EDD_MBR_SIG_NR_BUF 0x1ea /* addr of number of MBR signtaures at EDD_MBR_SIG_BUF |
| 51 | in boot_params - treat this as 1 byte */ | 51 | in boot_params - treat this as 1 byte */ |
| 52 | #define EDD_CL_EQUALS 0x3d646465 /* "edd=" */ | ||
| 53 | #define EDD_CL_OFF 0x666f /* "of" for off */ | ||
| 54 | #define EDD_CL_SKIP 0x6b73 /* "sk" for skipmbr */ | ||
| 55 | #define EDD_CL_ON 0x6e6f /* "on" for on */ | ||
| 56 | 52 | ||
| 57 | #ifndef __ASSEMBLY__ | 53 | #ifndef __ASSEMBLY__ |
| 58 | 54 | ||