diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-12-16 12:33:49 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-16 12:33:49 -0500 |
| commit | ee1156c11a1121e118b0a7f2dec240f0d421b1fd (patch) | |
| tree | b8771cc5a9758af9d7410fc519227c036c222130 /drivers/video/geode/lxfb.h | |
| parent | b9f8fcd55bbdb037e5332dbdb7b494f0b70861ac (diff) | |
| parent | 8bea8672edfca7ec5f661cafb218f1205863b343 (diff) | |
Merge branch 'linus' into sched/urgent
Conflicts:
kernel/sched_idletask.c
Merge reason: resolve the conflicts, pick up latest changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/video/geode/lxfb.h')
| -rw-r--r-- | drivers/video/geode/lxfb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/geode/lxfb.h b/drivers/video/geode/lxfb.h index 6a51448fd3f7..fc68a8b0a144 100644 --- a/drivers/video/geode/lxfb.h +++ b/drivers/video/geode/lxfb.h | |||
| @@ -409,7 +409,7 @@ static inline void write_fp(struct lxfb_par *par, int reg, uint32_t val) | |||
| 409 | } | 409 | } |
| 410 | 410 | ||
| 411 | 411 | ||
| 412 | /* MSRs are defined in asm/geode.h; their bitfields are here */ | 412 | /* MSRs are defined in linux/cs5535.h; their bitfields are here */ |
| 413 | 413 | ||
| 414 | #define MSR_GLCP_DOTPLL_LOCK (1 << 25) /* r/o */ | 414 | #define MSR_GLCP_DOTPLL_LOCK (1 << 25) /* r/o */ |
| 415 | #define MSR_GLCP_DOTPLL_HALFPIX (1 << 24) | 415 | #define MSR_GLCP_DOTPLL_HALFPIX (1 << 24) |