diff options
| author | Ingo Molnar | 2010-08-31 09:45:21 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2010-08-31 09:45:46 +0200 |
| commit | daab7fc734a53fdeaf844b7c03053118ad1769da (patch) | |
| tree | 575deb3cdcc6dda562acaed6f7c29bc81ae01cf2 /drivers/staging/vt6655/ioctl.h | |
| parent | x86: Remove old bootmem code (diff) | |
| parent | Linux 2.6.36-rc3 (diff) | |
| download | kernel-qcow2-linux-daab7fc734a53fdeaf844b7c03053118ad1769da.tar.gz kernel-qcow2-linux-daab7fc734a53fdeaf844b7c03053118ad1769da.tar.xz kernel-qcow2-linux-daab7fc734a53fdeaf844b7c03053118ad1769da.zip | |
Merge commit 'v2.6.36-rc3' into x86/memblock
Conflicts:
arch/x86/kernel/trampoline.c
mm/memblock.c
Merge reason: Resolve the conflicts, update to latest upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/staging/vt6655/ioctl.h')
| -rw-r--r-- | drivers/staging/vt6655/ioctl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/vt6655/ioctl.h b/drivers/staging/vt6655/ioctl.h index 0d10c2a923c6..ba85015c11b6 100644 --- a/drivers/staging/vt6655/ioctl.h +++ b/drivers/staging/vt6655/ioctl.h @@ -45,9 +45,9 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq); /* void vConfigWEPKey ( PSDevice pDevice, - DWORD dwKeyIndex, - PBYTE pbyKey, - ULONG uKeyLength + unsigned long dwKeyIndex, + unsigned char *pbyKey, + unsigned long uKeyLength ); */ |