diff options
| author |   Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/vt6656/iocmd.h | |
| parent | Merge branch 'upstream-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 (diff) | |
| parent | staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames. (diff) | |
| download | linux-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.xz linux-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip | |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vt6656/iocmd.h')
| -rw-r--r-- | drivers/staging/vt6656/iocmd.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/staging/vt6656/iocmd.h b/drivers/staging/vt6656/iocmd.h index 1ce39a4ba2f4..22710cef751d 100644 --- a/drivers/staging/vt6656/iocmd.h +++ b/drivers/staging/vt6656/iocmd.h @@ -33,10 +33,6 @@ /*--------------------- Export Definitions -------------------------*/ -#if !defined(DEF) -#define DEF -#endif - // ioctl Command code #define MAGIC_CODE 0x3142 #define IOCTL_CMD_TEST (SIOCDEVPRIVATE + 0) |