diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-01-09 17:38:26 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-01-09 17:38:26 +0100 |
commit | ff6383c8e4bde31036fbd31f7961539be288d6af (patch) | |
tree | 26f187f697be5f434f533d6b304bddd311cc81fd /include | |
parent | 2af31fbc239ae40a59f926bc5e505956a1bf27ef (diff) | |
parent | 11f588be314af70e1b058aac06663f29606846cd (diff) | |
download | barebox-ff6383c8e4bde31036fbd31f7961539be288d6af.tar.gz barebox-ff6383c8e4bde31036fbd31f7961539be288d6af.tar.xz |
Merge branch 'for-next/misc'
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/amba/sp804.h | 2 | ||||
-rw-r--r-- | include/linux/sizes.h (renamed from include/sizes.h) | 23 |
2 files changed, 8 insertions, 17 deletions
diff --git a/include/linux/amba/sp804.h b/include/linux/amba/sp804.h index aba550c374..8ec58f6c18 100644 --- a/include/linux/amba/sp804.h +++ b/include/linux/amba/sp804.h @@ -8,7 +8,7 @@ #define __AMBA_SP804_H__ #include <linux/amba/bus.h> -#include <sizes.h> +#include <linux/sizes.h> #define AMBA_ARM_SP804_ID 0x00141804 #define AMBA_ARM_SP804_ID_MASK 0x00ffffff diff --git a/include/sizes.h b/include/linux/sizes.h index 6f91e9b4bd..ce3e8150c1 100644 --- a/include/sizes.h +++ b/include/linux/sizes.h @@ -1,22 +1,13 @@ /* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * include/linux/sizes.h * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ -/* Size defintions - * Copyright (C) ARM Limited 1998. All rights reserved. + * 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__ -#ifndef __sizes_h -#define __sizes_h 1 - -/* handy sizes */ #define SZ_1 0x00000001 #define SZ_2 0x00000002 #define SZ_4 0x00000004 @@ -53,4 +44,4 @@ #define SZ_1G 0x40000000 #define SZ_2G 0x80000000 -#endif /* __sizes_h */ +#endif /* __LINUX_SIZES_H__ */ |