diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-02-23 17:17:43 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2010-02-23 17:17:43 +0100 |
| commit | b704836bc778d69d2236e18aa7c10ae8ad78eb7d (patch) | |
| tree | 22f0cb07c92c79da854266a8c5d5ad907e8d5996 /include | |
| parent | db811b97dd11cd1aa6d751e7d02fa73dc7b2ad4b (diff) | |
| parent | 9f3a6284880ceea452903e2043c88d7226736318 (diff) | |
| download | lwn-b704836bc778d69d2236e18aa7c10ae8ad78eb7d.tar.gz lwn-b704836bc778d69d2236e18aa7c10ae8ad78eb7d.zip | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rt/head
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/amba/bus.h | 6 | ||||
| -rw-r--r-- | include/linux/fs.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/amba/bus.h b/include/linux/amba/bus.h index ab94335b4bb9..6816be6c3f77 100644 --- a/include/linux/amba/bus.h +++ b/include/linux/amba/bus.h @@ -1,5 +1,9 @@ /* - * linux/include/asm-arm/hardware/amba.h + * linux/include/amba/bus.h + * + * This device type deals with ARM PrimeCells and anything else that + * presents a proper CID (0xB105F00D) at the end of the I/O register + * region or that is derived from a PrimeCell. * * Copyright (C) 2003 Deep Blue Solutions Ltd, All Rights Reserved. * diff --git a/include/linux/fs.h b/include/linux/fs.h index 064353a2bb1b..590c104f7fd3 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -729,6 +729,7 @@ struct inode { uid_t i_uid; gid_t i_gid; dev_t i_rdev; + unsigned int i_blkbits; u64 i_version; loff_t i_size; #ifdef __NEED_I_SIZE_ORDERED @@ -738,7 +739,6 @@ struct inode { struct timespec i_mtime; struct timespec i_ctime; blkcnt_t i_blocks; - unsigned int i_blkbits; unsigned short i_bytes; umode_t i_mode; spinlock_t i_lock; /* i_blocks, i_bytes, maybe i_size */ |