diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-05-30 16:34:37 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-05-30 16:34:37 -0400 |
| commit | 4ff4258a3e558814a3d48c50a59cd22f56bbea2f (patch) | |
| tree | 35ac4a5d2b162687eef0c38aecf14f3a7c5afee0 /arch/um/drivers/ssl.c | |
| parent | 442d207eb0b4e7047c4fedccd900c425e689d502 (diff) | |
| parent | 5e485b7975472ba4a408523deb6541e70c451842 (diff) | |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'arch/um/drivers/ssl.c')
| -rw-r--r-- | arch/um/drivers/ssl.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/drivers/ssl.c b/arch/um/drivers/ssl.c index a2bac429f3d4..b32a77010fbe 100644 --- a/arch/um/drivers/ssl.c +++ b/arch/um/drivers/ssl.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include "init.h" | 22 | #include "init.h" |
| 23 | #include "irq_user.h" | 23 | #include "irq_user.h" |
| 24 | #include "mconsole_kern.h" | 24 | #include "mconsole_kern.h" |
| 25 | #include "2_5compat.h" | ||
| 26 | 25 | ||
| 27 | static int ssl_version = 1; | 26 | static int ssl_version = 1; |
| 28 | 27 | ||