projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
drivers
/
media
/
radio
/
radio-timb.c
diff --git
a/drivers/media/radio/radio-timb.c
b/drivers/media/radio/radio-timb.c
index 1e3a8dd820a4382a26272ff4557024e64adc619d..a185610b376be1a14e79b52751c7f95aab777dd0 100644
(file)
--- a/
drivers/media/radio/radio-timb.c
+++ b/
drivers/media/radio/radio-timb.c
@@
-21,7
+21,6
@@
#include <media/v4l2-ioctl.h>
#include <media/v4l2-device.h>
#include <linux/platform_device.h>
#include <media/v4l2-ioctl.h>
#include <media/v4l2-device.h>
#include <linux/platform_device.h>
-#include <linux/mfd/core.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/interrupt.h>
#include <linux/slab.h>
#include <linux/i2c.h>
@@
-149,7
+148,7
@@
static const struct v4l2_file_operations timbradio_fops = {
static int __devinit timbradio_probe(struct platform_device *pdev)
{
static int __devinit timbradio_probe(struct platform_device *pdev)
{
- struct timb_radio_platform_data *pdata =
mfd_get_data(pdev)
;
+ struct timb_radio_platform_data *pdata =
pdev->dev.platform_data
;
struct timbradio *tr;
int err;
struct timbradio *tr;
int err;