diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /drivers/ide/ide-proc.c | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'drivers/ide/ide-proc.c')
| -rw-r--r-- | drivers/ide/ide-proc.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c index 28d09a5d8450..017c09540c2f 100644 --- a/drivers/ide/ide-proc.c +++ b/drivers/ide/ide-proc.c | |||
| @@ -273,14 +273,8 @@ static const struct ide_proc_devset ide_generic_settings[] = { | |||
| 273 | 273 | ||
| 274 | static void proc_ide_settings_warn(void) | 274 | static void proc_ide_settings_warn(void) |
| 275 | { | 275 | { |
| 276 | static int warned; | 276 | printk_once(KERN_WARNING "Warning: /proc/ide/hd?/settings interface is " |
| 277 | |||
| 278 | if (warned) | ||
| 279 | return; | ||
| 280 | |||
| 281 | printk(KERN_WARNING "Warning: /proc/ide/hd?/settings interface is " | ||
| 282 | "obsolete, and will be removed soon!\n"); | 277 | "obsolete, and will be removed soon!\n"); |
| 283 | warned = 1; | ||
| 284 | } | 278 | } |
| 285 | 279 | ||
| 286 | static int ide_settings_proc_show(struct seq_file *m, void *v) | 280 | static int ide_settings_proc_show(struct seq_file *m, void *v) |