diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-06 12:56:57 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-06 12:56:57 +1000 |
commit | 80b5e812077ec598f5bfad37adac4f149de12c56 (patch) | |
tree | 6efc3e3ffbd4f9c90422bbb7460c2ed5a6eaa867 /drivers/staging/ath6kl/include/athendpack.h | |
parent | 38ddfd31e6b5b57a3bd731813d52626ec2d58c77 (diff) | |
parent | d5ed54322e54d48e5fa66dff0086b79211f1cde7 (diff) |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/Makefile
drivers/staging/batman-adv/hard-interface.c
drivers/staging/mrst-touchscreen/Makefile
drivers/staging/mrst-touchscreen/intel-mid-touch.c
Diffstat (limited to 'drivers/staging/ath6kl/include/athendpack.h')
-rw-r--r-- | drivers/staging/ath6kl/include/athendpack.h | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/drivers/staging/ath6kl/include/athendpack.h b/drivers/staging/ath6kl/include/athendpack.h new file mode 100644 index 000000000000..1b940503bb21 --- /dev/null +++ b/drivers/staging/ath6kl/include/athendpack.h @@ -0,0 +1,52 @@ +//------------------------------------------------------------------------------ +// <copyright file="athendpack.h" company="Atheros"> +// Copyright (c) 2004-2010 Atheros Corporation. All rights reserved. +// +// +// Permission to use, copy, modify, and/or distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// +// +//------------------------------------------------------------------------------ +//============================================================================== +// end compiler-specific structure packing +// +// Author(s): ="Atheros" +//============================================================================== +#ifdef VXWORKS +#endif /* VXWORKS */ + +#if defined(LINUX) || defined(__linux__) +#endif /* LINUX */ + +#ifdef QNX +#endif /* QNX */ + +#ifdef INTEGRITY +#include "integrity/athendpack_integrity.h" +#endif /* INTEGRITY */ + +#ifdef NUCLEUS +#endif /* NUCLEUS */ + + +#ifdef UNDER_NWIFI +#include "../os/windows/include/athendpack.h" +#endif + +#ifdef ATHR_CE_LEGACY +#include "../os/windows/include/athendpack.h" +#endif /* WINCE */ + +#ifdef WIN_NWF +#include <athendpack_win.h> +#endif |