diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 07:39:56 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 07:40:01 -0500 |
| commit | 4d8cfec692e988b844dcaeaeb76b5780b7ef9d28 (patch) | |
| tree | 67d43adab2afd18a74d08f347e3676ae1a64193f /include/linux/hyperv.h | |
| parent | a3a3c4664184f86ef964323d106c62158e2b3f25 (diff) | |
| parent | 1d8c38c3d1b48eeb9cfaa42a8be13a1423569eb2 (diff) | |
Merge branch 'cleanup-3.4' of git://github.com/hzhuang1/linux into next/cleanup
* 'cleanup-3.4' of git://github.com/hzhuang1/linux: (2 commits)
rtc: sa1100: remove verification code of alarm
rtc: sa1100: remove periodic code
(update to v3.3-rc5)
Diffstat (limited to 'include/linux/hyperv.h')
| -rw-r--r-- | include/linux/hyperv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index 62b908e0e591..0ae065a5fcb2 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #include <linux/mod_devicetable.h> | 35 | #include <linux/mod_devicetable.h> |
| 36 | 36 | ||
| 37 | 37 | ||
| 38 | #define MAX_PAGE_BUFFER_COUNT 18 | 38 | #define MAX_PAGE_BUFFER_COUNT 19 |
| 39 | #define MAX_MULTIPAGE_BUFFER_COUNT 32 /* 128K */ | 39 | #define MAX_MULTIPAGE_BUFFER_COUNT 32 /* 128K */ |
| 40 | 40 | ||
| 41 | #pragma pack(push, 1) | 41 | #pragma pack(push, 1) |