diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-16 04:36:05 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-02-16 04:44:30 -0500 |
| commit | 9035a97a32836d0e456ddafaaf249a844e6e4b5e (patch) | |
| tree | 41ec3db083bdb46cd831f0d39db1fe294ae7d55f /include/linux/kernel.h | |
| parent | fe16d949b45036d9f80e20e07bde1ddacc930b10 (diff) | |
| parent | 452858338aec31c1f4414bf07f31663690479869 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Grab the latest stabilisation bits from -fixes and some suspend and
resume fixes from linus.
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_irq.c
Diffstat (limited to 'include/linux/kernel.h')
| -rw-r--r-- | include/linux/kernel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index e2f4d6af2125..2fe6e84894a4 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h | |||
| @@ -588,7 +588,7 @@ struct sysinfo { | |||
| 588 | 588 | ||
| 589 | /** | 589 | /** |
| 590 | * BUILD_BUG_ON - break compile if a condition is true. | 590 | * BUILD_BUG_ON - break compile if a condition is true. |
| 591 | * @cond: the condition which the compiler should know is false. | 591 | * @condition: the condition which the compiler should know is false. |
| 592 | * | 592 | * |
| 593 | * If you have some code which relies on certain constants being equal, or | 593 | * If you have some code which relies on certain constants being equal, or |
| 594 | * other compile-time-evaluated condition, you should use BUILD_BUG_ON to | 594 | * other compile-time-evaluated condition, you should use BUILD_BUG_ON to |