diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
| commit | 6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 (patch) | |
| tree | 797676a336b050bfa1ef879377c07e541b9075d6 /drivers/video/display/display-sysfs.c | |
| parent | 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f (diff) | |
| parent | c81eddb0e3728661d1585fbc564449c94165cc36 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/video/display/display-sysfs.c')
| -rw-r--r-- | drivers/video/display/display-sysfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/display/display-sysfs.c b/drivers/video/display/display-sysfs.c index 80abbf323b99..f6a09ab0dac6 100644 --- a/drivers/video/display/display-sysfs.c +++ b/drivers/video/display/display-sysfs.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/idr.h> | 27 | #include <linux/idr.h> |
| 28 | #include <linux/err.h> | 28 | #include <linux/err.h> |
| 29 | #include <linux/kdev_t.h> | 29 | #include <linux/kdev_t.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | 31 | ||
| 31 | static ssize_t display_show_name(struct device *dev, | 32 | static ssize_t display_show_name(struct device *dev, |
| 32 | struct device_attribute *attr, char *buf) | 33 | struct device_attribute *attr, char *buf) |