diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-29 05:54:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-29 05:54:24 -0400 |
| commit | 3825c9e8d01e4310c40a3903a354c433c32a7b6f (patch) | |
| tree | 87c94a8076bbb38bd2cf20ab9bc23d6f74f6a0a8 /drivers/media/dvb/siano/smsdvb.c | |
| parent | 5d7b605245b1aa1a9cd6549b1f57d69273eb0c37 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge commit 'v2.6.27-rc1' into x86/microcode
Conflicts:
arch/x86/kernel/microcode.c
Manual resolutions:
arch/x86/kernel/microcode_amd.c
arch/x86/kernel/microcode_intel.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/dvb/siano/smsdvb.c')
| -rw-r--r-- | drivers/media/dvb/siano/smsdvb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c index 6f9c18563867..229274a14110 100644 --- a/drivers/media/dvb/siano/smsdvb.c +++ b/drivers/media/dvb/siano/smsdvb.c | |||
| @@ -27,8 +27,8 @@ | |||
| 27 | 27 | ||
| 28 | DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); | 28 | DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); |
| 29 | 29 | ||
| 30 | struct list_head g_smsdvb_clients; | 30 | static struct list_head g_smsdvb_clients; |
| 31 | struct mutex g_smsdvb_clientslock; | 31 | static struct mutex g_smsdvb_clientslock; |
| 32 | 32 | ||
| 33 | static int smsdvb_onresponse(void *context, struct smscore_buffer_t *cb) | 33 | static int smsdvb_onresponse(void *context, struct smscore_buffer_t *cb) |
| 34 | { | 34 | { |