diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/mfd/timberdale.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/mfd/timberdale.h')
| -rw-r--r-- | drivers/mfd/timberdale.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/timberdale.h b/drivers/mfd/timberdale.h index c11bf6ebfe00..4412acd826fa 100644 --- a/drivers/mfd/timberdale.h +++ b/drivers/mfd/timberdale.h | |||
| @@ -23,7 +23,7 @@ | |||
| 23 | #ifndef MFD_TIMBERDALE_H | 23 | #ifndef MFD_TIMBERDALE_H |
| 24 | #define MFD_TIMBERDALE_H | 24 | #define MFD_TIMBERDALE_H |
| 25 | 25 | ||
| 26 | #define DRV_VERSION "0.2" | 26 | #define DRV_VERSION "0.3" |
| 27 | 27 | ||
| 28 | /* This driver only support versions >= 3.8 and < 4.0 */ | 28 | /* This driver only support versions >= 3.8 and < 4.0 */ |
| 29 | #define TIMB_SUPPORTED_MAJOR 3 | 29 | #define TIMB_SUPPORTED_MAJOR 3 |