Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/gpio/mc33880.c b/drivers/gpio/mc33880.c
index 935479da6705..4ec797593bdb 100644
--- a/drivers/gpio/mc33880.c
+++ b/drivers/gpio/mc33880.c
@@ -45,7 +45,7 @@
  * To save time we cache them here in memory
  */
 struct mc33880 {
-        struct mutex    lock;   /* protect from simultanous accesses */
+        struct mutex    lock;   /* protect from simultaneous accesses */
         u8              port_config;
         struct gpio_chip chip;
         struct spi_device *spi;
@@ -146,7 +146,7 @@ exit_destroy:
         return ret;
 }
 
-static int mc33880_remove(struct spi_device *spi)
+static int __devexit mc33880_remove(struct spi_device *spi)
 {
         struct mc33880 *mc;
         int ret;