diff --git a/[refs] b/[refs] index bacf7a312247..4bbf3c16641b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1039d762d03b573de4d46603c8583051c6d79094 +refs/heads/master: e536b62095301271d974983044a011c29fcb2ea2 diff --git a/trunk/drivers/mfd/da9052-spi.c b/trunk/drivers/mfd/da9052-spi.c index 76bb9ea0816e..6faf149e8d94 100644 --- a/trunk/drivers/mfd/da9052-spi.c +++ b/trunk/drivers/mfd/da9052-spi.c @@ -21,7 +21,7 @@ #include -static int da9052_spi_probe(struct spi_device *spi) +static int __devinit da9052_spi_probe(struct spi_device *spi) { int ret; const struct spi_device_id *id = spi_get_device_id(spi); @@ -63,7 +63,7 @@ static int da9052_spi_probe(struct spi_device *spi) return ret; } -static int da9052_spi_remove(struct spi_device *spi) +static int __devexit da9052_spi_remove(struct spi_device *spi) { struct da9052 *da9052 = dev_get_drvdata(&spi->dev);