From: Alexey Brodkin Date: Wed, 26 Feb 2014 13:47:58 +0000 (+0400) Subject: sizes.h - consolidate for all architectures X-Git-Tag: submit/tizen/20160318.071304~132 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1cce1d4090b45c705d3f0a0e26b7429fc6fcaed2;p=profile%2Fcommon%2Fplatform%2Fkernel%2Fu-boot-artik.git sizes.h - consolidate for all architectures Copied from Linux sources "include/linux/sizes.h" commit 413541dd66d51f791a0b169d9b9014e4f56be13c Signed-off-by: Alexey Brodkin Cc: Vineet Gupta Cc: Tom Rini Cc: Stefan Roese Cc: Albert Aribaud Acked-by: Tom Rini Acked-by: Stefan Roese [trini: Add bcm Kona platforms to the patch] Signed-off-by: Tom Rini Conflicts: arch/arm/cpu/armv7/kona-common/hwinit-common.c arch/arm/cpu/armv7/omap5/hwinit.c arch/arm/cpu/at91-common/phy.c arch/arm/include/asm/sizes.h board/compulab/cm_t335/spl.c board/freescale/mx6slevk/mx6slevk.c board/samsung/common/misc.c board/wandboard/wandboard.c drivers/fpga/zynqpl.c drivers/pci/pcie_imx.c include/configs/bcm28155_ap.h include/configs/beaver.h include/configs/cardhu.h include/configs/dalmore.h include/configs/harmony.h include/configs/hummingboard.h include/configs/mx6sabre_common.h include/configs/mx6slevk.h include/configs/paz00.h include/configs/rpi_b.h include/configs/tegra-common.h include/configs/trats.h include/configs/trats2.h include/configs/trimslice.h include/configs/udoo.h include/configs/venice2.h include/configs/ventana.h include/configs/wandboard.h include/configs/whistler.h include/usb/s3c_udc.h --- diff --git a/drivers/usb/gadget/f_thor.h b/drivers/usb/gadget/f_thor.h index 04ee9a243..833a9d24a 100644 --- a/drivers/usb/gadget/f_thor.h +++ b/drivers/usb/gadget/f_thor.h @@ -11,7 +11,7 @@ #define _USB_THOR_H_ #include -#include +#include /* THOR Composite Gadget */ #define STRING_MANUFACTURER_IDX 0 diff --git a/include/linux/sizes.h b/include/linux/sizes.h new file mode 100644 index 000000000..ce3e8150c --- /dev/null +++ b/include/linux/sizes.h @@ -0,0 +1,47 @@ +/* + * include/linux/sizes.h + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#ifndef __LINUX_SIZES_H__ +#define __LINUX_SIZES_H__ + +#define SZ_1 0x00000001 +#define SZ_2 0x00000002 +#define SZ_4 0x00000004 +#define SZ_8 0x00000008 +#define SZ_16 0x00000010 +#define SZ_32 0x00000020 +#define SZ_64 0x00000040 +#define SZ_128 0x00000080 +#define SZ_256 0x00000100 +#define SZ_512 0x00000200 + +#define SZ_1K 0x00000400 +#define SZ_2K 0x00000800 +#define SZ_4K 0x00001000 +#define SZ_8K 0x00002000 +#define SZ_16K 0x00004000 +#define SZ_32K 0x00008000 +#define SZ_64K 0x00010000 +#define SZ_128K 0x00020000 +#define SZ_256K 0x00040000 +#define SZ_512K 0x00080000 + +#define SZ_1M 0x00100000 +#define SZ_2M 0x00200000 +#define SZ_4M 0x00400000 +#define SZ_8M 0x00800000 +#define SZ_16M 0x01000000 +#define SZ_32M 0x02000000 +#define SZ_64M 0x04000000 +#define SZ_128M 0x08000000 +#define SZ_256M 0x10000000 +#define SZ_512M 0x20000000 + +#define SZ_1G 0x40000000 +#define SZ_2G 0x80000000 + +#endif /* __LINUX_SIZES_H__ */