diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2011-05-10 14:52:07 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2011-05-10 16:50:41 -0400 |
| commit | 020abf03cd659388f94cb328e1e1df0656e0d7ff (patch) | |
| tree | 40d05011708ad1b4a05928d167eb120420581aa6 /samples | |
| parent | 0ff8fbc61727c926883eec381fbd3d32d1fab504 (diff) | |
| parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f (diff) | |
Merge tag 'v2.6.39-rc7'
in order to pull in changes in drivers/media/dvb/firewire/ and
sound/firewire/.
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/Kconfig | 2 | ||||
| -rw-r--r-- | samples/hw_breakpoint/data_breakpoint.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/samples/Kconfig b/samples/Kconfig index e03cf0e374d7..41063e7592d2 100644 --- a/samples/Kconfig +++ b/samples/Kconfig | |||
| @@ -55,7 +55,7 @@ config SAMPLE_KFIFO | |||
| 55 | If in doubt, say "N" here. | 55 | If in doubt, say "N" here. |
| 56 | 56 | ||
| 57 | config SAMPLE_KDB | 57 | config SAMPLE_KDB |
| 58 | tristate "Build kdb command exmaple -- loadable modules only" | 58 | tristate "Build kdb command example -- loadable modules only" |
| 59 | depends on KGDB_KDB && m | 59 | depends on KGDB_KDB && m |
| 60 | help | 60 | help |
| 61 | Build an example of how to dynamically add the hello | 61 | Build an example of how to dynamically add the hello |
diff --git a/samples/hw_breakpoint/data_breakpoint.c b/samples/hw_breakpoint/data_breakpoint.c index bd0f337afcab..063653955f9f 100644 --- a/samples/hw_breakpoint/data_breakpoint.c +++ b/samples/hw_breakpoint/data_breakpoint.c | |||
| @@ -19,7 +19,7 @@ | |||
| 19 | * | 19 | * |
| 20 | * This file is a kernel module that places a breakpoint over ksym_name kernel | 20 | * This file is a kernel module that places a breakpoint over ksym_name kernel |
| 21 | * variable using Hardware Breakpoint register. The corresponding handler which | 21 | * variable using Hardware Breakpoint register. The corresponding handler which |
| 22 | * prints a backtrace is invoked everytime a write operation is performed on | 22 | * prints a backtrace is invoked every time a write operation is performed on |
| 23 | * that variable. | 23 | * that variable. |
| 24 | * | 24 | * |
| 25 | * Copyright (C) IBM Corporation, 2009 | 25 | * Copyright (C) IBM Corporation, 2009 |