diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /samples | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
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 |