diff --git a/[refs] b/[refs] index 4a4e22791b0a..e762936ad154 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 985dbe776b0411ebf740b72a94a397fd0217570f +refs/heads/master: 30b5309ae54723785bd0572be9316afd5dc203a7 diff --git a/trunk/drivers/staging/iio/adc/Makefile b/trunk/drivers/staging/iio/adc/Makefile index f4aa63a18187..2094dbd34499 100644 --- a/trunk/drivers/staging/iio/adc/Makefile +++ b/trunk/drivers/staging/iio/adc/Makefile @@ -9,4 +9,4 @@ obj-$(CONFIG_MAX1363) += max1363.o ad799x-y := ad799x_core.o ad799x-$(CONFIG_AD799X_RING_BUFFER) += ad799x_ring.o -obj-$(CONFIG_AD799X) += ad799x.o \ No newline at end of file +obj-$(CONFIG_AD799X) += ad799x.o diff --git a/trunk/drivers/staging/iio/adc/ad799x.h b/trunk/drivers/staging/iio/adc/ad799x.h index 73f3ec5ba226..23259290ce45 100644 --- a/trunk/drivers/staging/iio/adc/ad799x.h +++ b/trunk/drivers/staging/iio/adc/ad799x.h @@ -124,7 +124,7 @@ struct ad799x_state { }; /* - * TODO: struct ad799x_platform_data needs to go into inlude/linux/iio + * TODO: struct ad799x_platform_data needs to go into include/linux/iio */ struct ad799x_platform_data {