diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-05 21:49:57 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-05 21:50:05 +0100 |
| commit | 285c1a2c3a5f84ce1c811ab4cb1f8a17466e1a06 (patch) | |
| tree | 7eb4aeab927a25b6cc82aef21ffd5a4f4866ae4b /Documentation/kernel-parameters.txt | |
| parent | 1fb0ef31f428f345a7c3666f8e7444a563edd537 (diff) | |
| parent | a9fe8d5fd52ecd17c3f3970bbcf6b3573f831898 (diff) | |
| download | talos-op-linux-285c1a2c3a5f84ce1c811ab4cb1f8a17466e1a06.tar.gz talos-op-linux-285c1a2c3a5f84ce1c811ab4cb1f8a17466e1a06.zip | |
Merge branch 'irq/urgent' into irq/core
Reason: Get mainline fixes integrated. Further patches conflict with
them
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index b72e071a3e5b..89835a4766a6 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -43,11 +43,11 @@ parameter is applicable: AVR32 AVR32 architecture is enabled. AX25 Appropriate AX.25 support is enabled. BLACKFIN Blackfin architecture is enabled. + DRM Direct Rendering Management support is enabled. + DYNAMIC_DEBUG Build in debug messages and enable them at runtime EDD BIOS Enhanced Disk Drive Services (EDD) is enabled EFI EFI Partitioning (GPT) is enabled EIDE EIDE/ATAPI support is enabled. - DRM Direct Rendering Management support is enabled. - DYNAMIC_DEBUG Build in debug messages and enable them at runtime FB The frame buffer device is enabled. GCOV GCOV profiling is enabled. HW Appropriate hardware is enabled. |
