Merge branch 'for-3.15' of git://linux-nfs.org/~bfields/linux

[karo-tx-linux.git] / drivers / staging / android / timed_gpio.c

diff --git a/drivers/staging/android/timed_gpio.c b/drivers/staging/android/timed_gpio.c
index 3f69b3481779789c568e043d125a4e08c2a057be..0c7fdc83b3367f3fc2a66a46a47e9d7c4c00cc0d 100644 (file)
--- a/drivers/staging/android/timed_gpio.c
+++ b/drivers/staging/android/timed_gpio.c
@@ -90,7 +90,7 @@ static int timed_gpio_probe(struct platform_device *pdev)
        if (!pdata)
                return -EBUSY;
 
-       gpio_data = devm_kzalloc(&pdev->dev, 
+       gpio_data = devm_kzalloc(&pdev->dev,
                                sizeof(struct timed_gpio_data) * pdata->num_gpios,
                                GFP_KERNEL);
        if (!gpio_data)