diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 15:22:08 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-10 15:22:08 +0400 |
| commit | fb8231a8b139035476f2a8aaac837d0099b66dad (patch) | |
| tree | 2875806beb96ea0cdab292146767a5085721dc6a /drivers/leds/leds-bd2802.c | |
| parent | 426d31071ac476ea62c62656b242930c17b58c00 (diff) | |
| parent | f6cec0ae58c17522a7bc4e2f39dae19f199ab534 (diff) | |
| download | linux-fb8231a8b139035476f2a8aaac837d0099b66dad.tar.xz | |
Merge branch 'master' into for-next
Conflicts:
arch/arm/mach-omap1/board-nokia770.c
Diffstat (limited to 'drivers/leds/leds-bd2802.c')
| -rw-r--r-- | drivers/leds/leds-bd2802.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/leds/leds-bd2802.c b/drivers/leds/leds-bd2802.c index 5dcdf9d69b3a..19dc4b61a105 100644 --- a/drivers/leds/leds-bd2802.c +++ b/drivers/leds/leds-bd2802.c @@ -351,7 +351,7 @@ static ssize_t bd2802_store_reg##reg_addr(struct device *dev, \ return count; \ } \ static struct device_attribute bd2802_reg##reg_addr##_attr = { \ - .attr = {.name = reg_name, .mode = 0644, .owner = THIS_MODULE}, \ + .attr = {.name = reg_name, .mode = 0644}, \ .store = bd2802_store_reg##reg_addr, \ }; @@ -482,7 +482,6 @@ static struct device_attribute bd2802_adv_conf_attr = { .attr = { .name = "advanced_configuration", .mode = 0644, - .owner = THIS_MODULE }, .show = bd2802_show_adv_conf, .store = bd2802_store_adv_conf, @@ -519,7 +518,6 @@ static struct device_attribute bd2802_##attr_name##_attr = { \ .attr = { \ .name = name_str, \ .mode = 0644, \ - .owner = THIS_MODULE \ }, \ .show = bd2802_show_##attr_name, \ .store = bd2802_store_##attr_name, \ |