diff options
| author | David S. Miller <davem@davemloft.net> | 2013-01-15 15:05:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-15 15:05:59 -0500 |
| commit | 4b87f922598acf91eee18f71688a33f54f57bcde (patch) | |
| tree | 9cdfe30c6b96c47093da5392ed82d147290cd64c /drivers/rtc/rtc-rx8025.c | |
| parent | 55eb555d9674e2ebe9d4de0146602f96ff18e7d6 (diff) | |
| parent | daf3ec688e057f6060fb9bb0819feac7a8bbf45c (diff) | |
| download | linux-4b87f922598acf91eee18f71688a33f54f57bcde.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/rtc/rtc-rx8025.c')
| -rw-r--r-- | drivers/rtc/rtc-rx8025.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-rx8025.c b/drivers/rtc/rtc-rx8025.c index 0de902dc1cd5..0722d36b9c9a 100644 --- a/drivers/rtc/rtc-rx8025.c +++ b/drivers/rtc/rtc-rx8025.c @@ -534,8 +534,8 @@ static void rx8025_sysfs_unregister(struct device *dev) device_remove_file(dev, &dev_attr_clock_adjust_ppb); } -static int __devinit rx8025_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int rx8025_probe(struct i2c_client *client, + const struct i2c_device_id *id) { struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); struct rx8025_data *rx8025; @@ -614,7 +614,7 @@ errout: return err; } -static int __devexit rx8025_remove(struct i2c_client *client) +static int rx8025_remove(struct i2c_client *client) { struct rx8025_data *rx8025 = i2c_get_clientdata(client); struct mutex *lock = &rx8025->rtc->ops_lock; @@ -640,7 +640,7 @@ static struct i2c_driver rx8025_driver = { .owner = THIS_MODULE, }, .probe = rx8025_probe, - .remove = __devexit_p(rx8025_remove), + .remove = rx8025_remove, .id_table = rx8025_id, }; |