diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /include/linux/cciss_ioctl.h | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'include/linux/cciss_ioctl.h')
| -rw-r--r-- | include/linux/cciss_ioctl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cciss_ioctl.h b/include/linux/cciss_ioctl.h index 6e27f42e3a57..cb57c30081a8 100644 --- a/include/linux/cciss_ioctl.h +++ b/include/linux/cciss_ioctl.h | |||
| @@ -80,7 +80,7 @@ typedef __u32 DriverVer_type; | |||
| 80 | #define HWORD __u16 | 80 | #define HWORD __u16 |
| 81 | #define DWORD __u32 | 81 | #define DWORD __u32 |
| 82 | 82 | ||
| 83 | #define CISS_MAX_LUN 16 | 83 | #define CISS_MAX_LUN 1024 |
| 84 | 84 | ||
| 85 | #define LEVEL2LUN 1 // index into Target(x) structure, due to byte swapping | 85 | #define LEVEL2LUN 1 // index into Target(x) structure, due to byte swapping |
| 86 | #define LEVEL3LUN 0 | 86 | #define LEVEL3LUN 0 |