summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-07-23 22:23:23 +0200
committerWolfgang Denk <wd@denx.de>2009-07-23 22:23:23 +0200
commit28958b8bea4c66629c5a22fd3c8b0d49df90383d (patch)
treef08a1dd5900656d90ef5af09843539d4956849b8 /include
parent2632c008e2c2cd61fefb622ed671ea3e6bd2e2a6 (diff)
downloadu-boot-imx-28958b8bea4c66629c5a22fd3c8b0d49df90383d.zip
u-boot-imx-28958b8bea4c66629c5a22fd3c8b0d49df90383d.tar.gz
u-boot-imx-28958b8bea4c66629c5a22fd3c8b0d49df90383d.tar.bz2
Coding Style cleanup; update CHANGELOG.
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include')
-rw-r--r--include/configs/cm-bf561.h2
-rw-r--r--include/u-boot/zlib.h14
2 files changed, 8 insertions, 8 deletions
diff --git a/include/configs/cm-bf561.h b/include/configs/cm-bf561.h
index 1153f11..59dc8d2 100644
--- a/include/configs/cm-bf561.h
+++ b/include/configs/cm-bf561.h
@@ -65,7 +65,7 @@
#define CONFIG_SMC91111_BASE 0x28000300
/* The next 3 lines are for use with EXT-BF5xx-USB-ETH2 */
/* #define CONFIG_DRIVER_SMC911X 1 */
-/* #define CONFIG_DRIVER_SMC911X_BASE 0x24080000 // AMS1 */
+/* #define CONFIG_DRIVER_SMC911X_BASE 0x24080000 /! AMS1 */
/* #define CONFIG_DRIVER_SMC911X_32_BIT 1 */
#define CONFIG_HOSTNAME cm-bf561
/* Uncomment next line to use fixed MAC address */
diff --git a/include/u-boot/zlib.h b/include/u-boot/zlib.h
index fb27081..a817e4c 100644
--- a/include/u-boot/zlib.h
+++ b/include/u-boot/zlib.h
@@ -200,7 +200,7 @@ extern "C" {
#endif
/* The memory requirements for deflate are (in bytes):
- (1 << (windowBits+2)) + (1 << (memLevel+9))
+ (1 << (windowBits+2)) + (1 << (memLevel+9))
that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values)
plus a few kilobytes for small objects. For example, if you want to reduce
the default memory requirements from 256K to 128K, compile with
@@ -212,7 +212,7 @@ extern "C" {
for small objects.
*/
- /* Type declarations */
+ /* Type declarations */
#ifndef OF /* function prototypes */
# ifdef STDC
@@ -461,7 +461,7 @@ typedef struct gz_header_s {
typedef gz_header FAR *gz_headerp;
- /* constants */
+ /* constants */
#define Z_NO_FLUSH 0
#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
#define Z_SYNC_FLUSH 2
@@ -507,7 +507,7 @@ typedef gz_header FAR *gz_headerp;
#define Z_NULL 0 /* for initializing zalloc, zfree, opaque */
- /* basic functions */
+ /* basic functions */
/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
If the first character differs, the library code actually used is
@@ -627,11 +627,11 @@ ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
static string (which must not be deallocated).
*/
- /* Advanced functions */
+ /* Advanced functions */
ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
- /* utility functions */
+ /* utility functions */
/*
The following utility functions are implemented on top of the
@@ -681,7 +681,7 @@ ZEXTERN uInt ZEXPORT crc32 OF((uInt crc, const Bytef *buf, uInt len));
*/
ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int windowBits,
- const char *version, int stream_size));
+ const char *version, int stream_size));
#define inflateInit(strm) \
inflateInit_((strm), ZLIB_VERSION, sizeof(z_stream))
#define inflateInit2(strm, windowBits) \