diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 07:17:26 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-22 07:17:26 -0400 |
| commit | f9b44121b34174ae4f243a568393fc3225842e75 (patch) | |
| tree | 943f68cd7458d08a9e8809ed0a10b71b23911f3e /drivers/rtc/rtc-ds1742.c | |
| parent | 8727b909bb2348d29e62c599cd7a5d610da3760f (diff) | |
| parent | 220bf991b0366cc50a94feede3d7341fa5710ee4 (diff) | |
Merge commit 'v2.6.34-rc2' into for-2.6.34
Diffstat (limited to 'drivers/rtc/rtc-ds1742.c')
| -rw-r--r-- | drivers/rtc/rtc-ds1742.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c index a1273360a44e..cad9ceb89baf 100644 --- a/drivers/rtc/rtc-ds1742.c +++ b/drivers/rtc/rtc-ds1742.c | |||
| @@ -184,6 +184,7 @@ static int __devinit ds1742_rtc_probe(struct platform_device *pdev) | |||
| 184 | pdata->size_nvram = pdata->size - RTC_SIZE; | 184 | pdata->size_nvram = pdata->size - RTC_SIZE; |
| 185 | pdata->ioaddr_rtc = ioaddr + pdata->size_nvram; | 185 | pdata->ioaddr_rtc = ioaddr + pdata->size_nvram; |
| 186 | 186 | ||
| 187 | sysfs_bin_attr_init(&pdata->nvram_attr); | ||
| 187 | pdata->nvram_attr.attr.name = "nvram"; | 188 | pdata->nvram_attr.attr.name = "nvram"; |
| 188 | pdata->nvram_attr.attr.mode = S_IRUGO | S_IWUSR; | 189 | pdata->nvram_attr.attr.mode = S_IRUGO | S_IWUSR; |
| 189 | pdata->nvram_attr.read = ds1742_nvram_read; | 190 | pdata->nvram_attr.read = ds1742_nvram_read; |