diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-16 01:24:37 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-16 01:24:37 +0400 |
| commit | ca994a36f585432458ead9133fcfe05440edbb7b (patch) | |
| tree | be05512153a9cd5cbe1f1234bc09fd9cd388ec58 /drivers/media/video/tlg2300/pd-common.h | |
| parent | 12325280dfeba18164f9c47e226a40ab34e23ee7 (diff) | |
| parent | 2504a6423b9ab4c36df78227055995644de19edb (diff) | |
| download | linux-ca994a36f585432458ead9133fcfe05440edbb7b.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
net/mac80211/debugfs_sta.c
net/mac80211/sta_info.h
Diffstat (limited to 'drivers/media/video/tlg2300/pd-common.h')
| -rw-r--r-- | drivers/media/video/tlg2300/pd-common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/tlg2300/pd-common.h b/drivers/media/video/tlg2300/pd-common.h index 56564e6aaac2..5dd73b7857d1 100644 --- a/drivers/media/video/tlg2300/pd-common.h +++ b/drivers/media/video/tlg2300/pd-common.h @@ -140,7 +140,7 @@ struct pd_dvb_adapter { u8 reserved[3]; /* data for power resume*/ - struct dvb_frontend_parameters fe_param; + struct dtv_frontend_properties fe_param; /* for channel scanning */ int prev_freq; |