diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-10 11:54:47 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-10 11:54:47 +0000 |
| commit | a2ac82c9d0b5898426a9379d8c3855b03614dbf6 (patch) | |
| tree | 23750cba64f601506d65203503e49528dc365834 /mm | |
| parent | bccb225417c38461916eced0d24cfdfcdfb03f86 (diff) | |
| parent | 2156eda2aafa0b0f660656246a11d7c2a9947ff9 (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
Conflicts:
arch/arm/include/asm/hardware/coresight.h
arch/arm/kernel/etm.c
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/backing-dev.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mm/backing-dev.c b/mm/backing-dev.c index eea1a9dfac38..2e53312b8907 100644 --- a/mm/backing-dev.c +++ b/mm/backing-dev.c @@ -232,8 +232,6 @@ static ssize_t stable_pages_required_show(struct device *dev, bdi_cap_stable_pages_required(bdi) ? 1 : 0); } -#define __ATTR_RW(attr) __ATTR(attr, 0644, attr##_show, attr##_store) - static struct device_attribute bdi_dev_attrs[] = { __ATTR_RW(read_ahead_kb), __ATTR_RW(min_ratio), |