aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/hv/Hv.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-02-25 22:10:38 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-02-25 22:10:38 +0000
commit9f33be2c3a80bdc2cc08342dd77fac87652e0548 (patch)
tree7ad6e825427a15c5ec0fc15540abc0429d7f4bce /drivers/staging/hv/Hv.h
parent2741ecb4ce5c2d430b5c44b0a169038338c21df5 (diff)
parenteed18b5fa4d297c681b00144e8c6942dd35d39a7 (diff)
downloadkernel_samsung_smdk4412-9f33be2c3a80bdc2cc08342dd77fac87652e0548.zip
kernel_samsung_smdk4412-9f33be2c3a80bdc2cc08342dd77fac87652e0548.tar.gz
kernel_samsung_smdk4412-9f33be2c3a80bdc2cc08342dd77fac87652e0548.tar.bz2
Merge branches 'clks' and 'pnx' into devel
Diffstat (limited to 'drivers/staging/hv/Hv.h')
-rw-r--r--drivers/staging/hv/Hv.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/hv/Hv.h b/drivers/staging/hv/Hv.h
index 5379e4b..fce4b5c 100644
--- a/drivers/staging/hv/Hv.h
+++ b/drivers/staging/hv/Hv.h
@@ -93,7 +93,7 @@ static const struct hv_guid VMBUS_SERVICE_ID = {
},
};
-#define MAX_NUM_CPUS 1
+#define MAX_NUM_CPUS 32
struct hv_input_signal_event_buffer {
@@ -137,8 +137,8 @@ extern u16 HvPostMessage(union hv_connection_id connectionId,
extern u16 HvSignalEvent(void);
-extern int HvSynicInit(u32 irqVector);
+extern void HvSynicInit(void *irqarg);
-extern void HvSynicCleanup(void);
+extern void HvSynicCleanup(void *arg);
#endif /* __HV_H__ */