diff options
| author | Dave Jones <davej@redhat.com> | 2005-11-29 15:48:34 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2005-11-29 15:48:34 -0500 |
| commit | be37bdbce7ceaacf4f20c6cc759efbe75ebd1196 (patch) | |
| tree | f1a42fb5a4a17eea41d47d2c002fa303009f5523 /include/asm-um/ldt-i386.h | |
| parent | 019a61b99338d0ac05de25317b85da88e7ec4b35 (diff) | |
| parent | d70aa5e4b54aa7e704c886838715ac8a45d5750f (diff) | |
Merge ../linus
Diffstat (limited to 'include/asm-um/ldt-i386.h')
| -rw-r--r-- | include/asm-um/ldt-i386.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-um/ldt-i386.h b/include/asm-um/ldt-i386.h index b42662929b6c..175722a91164 100644 --- a/include/asm-um/ldt-i386.h +++ b/include/asm-um/ldt-i386.h | |||
| @@ -35,7 +35,7 @@ typedef struct uml_ldt { | |||
| 35 | union { | 35 | union { |
| 36 | struct ldt_entry * pages[LDT_PAGES_MAX]; | 36 | struct ldt_entry * pages[LDT_PAGES_MAX]; |
| 37 | struct ldt_entry entries[LDT_DIRECT_ENTRIES]; | 37 | struct ldt_entry entries[LDT_DIRECT_ENTRIES]; |
| 38 | }; | 38 | } u; |
| 39 | } uml_ldt_t; | 39 | } uml_ldt_t; |
| 40 | 40 | ||
| 41 | /* | 41 | /* |