summaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-floppy_proc.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-05-09 03:29:27 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-05-09 03:29:27 +0200
commitd585a021c0b10b0477d6b608c53e1feb8cde0507 (patch)
tree5ca059da1db7f15d4b29427644ad9c08270c885c /drivers/ide/ide-floppy_proc.c
parentInput: wm97xx - do not access dev->driver_data directly (diff)
parentLinux 2.6.30-rc5 (diff)
downloadlinux-d585a021c0b10b0477d6b608c53e1feb8cde0507.tar.xz
linux-d585a021c0b10b0477d6b608c53e1feb8cde0507.zip
Merge commit 'v2.6.30-rc5' into next
Diffstat (limited to 'drivers/ide/ide-floppy_proc.c')
-rw-r--r--drivers/ide/ide-floppy_proc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-floppy_proc.c b/drivers/ide/ide-floppy_proc.c
index 3ec762cb60ab..fcd4d8153df5 100644
--- a/drivers/ide/ide-floppy_proc.c
+++ b/drivers/ide/ide-floppy_proc.c
@@ -29,5 +29,5 @@ const struct ide_proc_devset ide_floppy_settings[] = {
IDE_PROC_DEVSET(bios_head, 0, 255),
IDE_PROC_DEVSET(bios_sect, 0, 63),
IDE_PROC_DEVSET(ticks, 0, 255),
- { 0 },
+ { NULL },
};