diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-08 10:08:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-08 10:08:26 -0700 |
| commit | 53bcef60633086ad73683d01a4ef9ca678484d2d (patch) | |
| tree | 8b14cc031124d0aa0da6cd3b60115bc7eaa80061 /arch/cris/arch-v10/drivers/i2c.h | |
| parent | Merge branch 'for-linus' of git://android.kernel.org/kernel/tegra (diff) | |
| parent | CRIS: Fix alignment problem for older ld (diff) | |
| download | linux-dev-53bcef60633086ad73683d01a4ef9ca678484d2d.tar.xz linux-dev-53bcef60633086ad73683d01a4ef9ca678484d2d.zip | |
Merge branch 'for-linus' of git://www.jni.nu/cris
* 'for-linus' of git://www.jni.nu/cris: (51 commits)
CRIS: Fix alignment problem for older ld
CRIS: Always dump registers for segfaulting process.
CRIS: Add config for pausing a seg-faulting process
CRIS: Don't take faults while in_atomic
CRIS: Fixup lookup for delay slot faults
CRIS: Discard exit.text and .data at runtime
CRIS: Add cache aligned and read mostly data sections
CRIS: Return something from profile write
CRIS: Add ARTPEC-3 and timestamps for sync-serial
CRIS: Better ARTPEC-3 support for gpio
CRIS: Add include guard
CRIS: Better handling of pinmux settings
CRIS: New DMA defines for ARTPEC-3
CRIS: __do_strncpy_from_user: Don't read the byte beyond the nil
CRIS: Pagetable for ARTPEC-3
CRIS: Machine dependent memmap.h
CRIS: Check if pointer is set before using it
CRIS: Machine dependent dma.h
CRIS: Define __read_mostly for CRISv32
CRIS: Discard .note.gnu.build-id section
...
Diffstat (limited to 'arch/cris/arch-v10/drivers/i2c.h')
| -rw-r--r-- | arch/cris/arch-v10/drivers/i2c.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/cris/arch-v10/drivers/i2c.h b/arch/cris/arch-v10/drivers/i2c.h index 4ee91426bd40..e36c96276478 100644 --- a/arch/cris/arch-v10/drivers/i2c.h +++ b/arch/cris/arch-v10/drivers/i2c.h @@ -1,5 +1,4 @@ -/* $Id: i2c.h,v 1.3 2004/05/28 09:26:59 starvik Exp $ */ - +/* i2c.h */ int i2c_init(void); /* High level I2C actions */ |