diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
| commit | 84c3d4aaec3338201b449034beac41635866bddf (patch) | |
| tree | 3412951682fb2dd4feb8a5532f8efbaf8b345933 /drivers/media/dvb/frontends/sp887x.c | |
| parent | 43d2548bb2ef7e6d753f91468a746784041e522d (diff) | |
| parent | fafa3a3f16723997f039a0193997464d66dafd8f (diff) | |
Merge commit 'origin/master'
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/kernel/stacktrace.c
arch/powerpc/mm/slice.c
arch/ppc/kernel/smp.c
Diffstat (limited to 'drivers/media/dvb/frontends/sp887x.c')
| -rw-r--r-- | drivers/media/dvb/frontends/sp887x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb/frontends/sp887x.c index 49f55877f513..4543609e1816 100644 --- a/drivers/media/dvb/frontends/sp887x.c +++ b/drivers/media/dvb/frontends/sp887x.c | |||
| @@ -140,7 +140,7 @@ static int sp887x_initial_setup (struct dvb_frontend* fe, const struct firmware | |||
| 140 | u8 buf [BLOCKSIZE+2]; | 140 | u8 buf [BLOCKSIZE+2]; |
| 141 | int i; | 141 | int i; |
| 142 | int fw_size = fw->size; | 142 | int fw_size = fw->size; |
| 143 | unsigned char *mem = fw->data; | 143 | const unsigned char *mem = fw->data; |
| 144 | 144 | ||
| 145 | dprintk("%s\n", __func__); | 145 | dprintk("%s\n", __func__); |
| 146 | 146 | ||