Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

[~andy/linux] / include / linux / ide.h

diff --git a/include/linux/ide.h b/include/linux/ide.h
index 42557851b12e03ea510223f192dcc273dffa8f2c..501370b61ee5017c43b1157a834dac19dddae098 100644 (file)
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -920,7 +920,7 @@ __IDE_PROC_DEVSET(_name, _min, _max, NULL, NULL)
 
 typedef struct {
        const char      *name;
-       mode_t          mode;
+       umode_t         mode;
        const struct file_operations *proc_fops;
 } ide_proc_entry_t;