diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/misc/ep93xx_pwm.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/misc/ep93xx_pwm.c')
| -rw-r--r-- | drivers/misc/ep93xx_pwm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/ep93xx_pwm.c b/drivers/misc/ep93xx_pwm.c index 46b3439673e9..16d7179e2f9b 100644 --- a/drivers/misc/ep93xx_pwm.c +++ b/drivers/misc/ep93xx_pwm.c | |||
| @@ -249,11 +249,11 @@ static ssize_t ep93xx_pwm_set_invert(struct device *dev, | |||
| 249 | 249 | ||
| 250 | static DEVICE_ATTR(min_freq, S_IRUGO, ep93xx_pwm_get_min_freq, NULL); | 250 | static DEVICE_ATTR(min_freq, S_IRUGO, ep93xx_pwm_get_min_freq, NULL); |
| 251 | static DEVICE_ATTR(max_freq, S_IRUGO, ep93xx_pwm_get_max_freq, NULL); | 251 | static DEVICE_ATTR(max_freq, S_IRUGO, ep93xx_pwm_get_max_freq, NULL); |
| 252 | static DEVICE_ATTR(freq, S_IWUGO | S_IRUGO, | 252 | static DEVICE_ATTR(freq, S_IWUSR | S_IRUGO, |
| 253 | ep93xx_pwm_get_freq, ep93xx_pwm_set_freq); | 253 | ep93xx_pwm_get_freq, ep93xx_pwm_set_freq); |
| 254 | static DEVICE_ATTR(duty_percent, S_IWUGO | S_IRUGO, | 254 | static DEVICE_ATTR(duty_percent, S_IWUSR | S_IRUGO, |
| 255 | ep93xx_pwm_get_duty_percent, ep93xx_pwm_set_duty_percent); | 255 | ep93xx_pwm_get_duty_percent, ep93xx_pwm_set_duty_percent); |
| 256 | static DEVICE_ATTR(invert, S_IWUGO | S_IRUGO, | 256 | static DEVICE_ATTR(invert, S_IWUSR | S_IRUGO, |
| 257 | ep93xx_pwm_get_invert, ep93xx_pwm_set_invert); | 257 | ep93xx_pwm_get_invert, ep93xx_pwm_set_invert); |
| 258 | 258 | ||
| 259 | static struct attribute *ep93xx_pwm_attrs[] = { | 259 | static struct attribute *ep93xx_pwm_attrs[] = { |