diff options
| author | Steven Rostedt <srostedt@redhat.com> | 2009-03-12 21:12:46 -0400 |
|---|---|---|
| committer | Steven Rostedt <srostedt@redhat.com> | 2009-03-12 21:12:46 -0400 |
| commit | 51b643b404827d8fde60d7953773a42d46ca87e0 (patch) | |
| tree | ae71fcbd8b3640b68fc11e1dca620a8ee96bac5f /drivers/ide/ide-disk_proc.c | |
| parent | 554f786e284a6ce859d51f62240d615603944c8e (diff) | |
| parent | 480c93df5b99699390f93a7024c9f60d09da0e96 (diff) | |
Merge branch 'tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/ftrace-merge
Diffstat (limited to 'drivers/ide/ide-disk_proc.c')
| -rw-r--r-- | drivers/ide/ide-disk_proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-disk_proc.c b/drivers/ide/ide-disk_proc.c index 1146f4204c6..1f86dcbd2b1 100644 --- a/drivers/ide/ide-disk_proc.c +++ b/drivers/ide/ide-disk_proc.c @@ -125,5 +125,5 @@ const struct ide_proc_devset ide_disk_settings[] = { IDE_PROC_DEVSET(multcount, 0, 16), IDE_PROC_DEVSET(nowerr, 0, 1), IDE_PROC_DEVSET(wcache, 0, 1), - { 0 }, + { NULL }, }; |