diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
| commit | 84c3d4aaec3338201b449034beac41635866bddf (patch) | |
| tree | 3412951682fb2dd4feb8a5532f8efbaf8b345933 /drivers/i2c/busses/i2c-hydra.c | |
| parent | 43d2548bb2ef7e6d753f91468a746784041e522d (diff) | |
| parent | fafa3a3f16723997f039a0193997464d66dafd8f (diff) | |
Merge commit 'origin/master'
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/kernel/stacktrace.c
arch/powerpc/mm/slice.c
arch/ppc/kernel/smp.c
Diffstat (limited to 'drivers/i2c/busses/i2c-hydra.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-hydra.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-hydra.c b/drivers/i2c/busses/i2c-hydra.c index f9972f9651e4..1098f21ace13 100644 --- a/drivers/i2c/busses/i2c-hydra.c +++ b/drivers/i2c/busses/i2c-hydra.c | |||
| @@ -1,7 +1,4 @@ | |||
| 1 | /* | 1 | /* |
| 2 | i2c-hydra.c - Part of lm_sensors, Linux kernel modules | ||
| 3 | for hardware monitoring | ||
| 4 | |||
| 5 | i2c Support for the Apple `Hydra' Mac I/O | 2 | i2c Support for the Apple `Hydra' Mac I/O |
| 6 | 3 | ||
| 7 | Copyright (c) 1999-2004 Geert Uytterhoeven <geert@linux-m68k.org> | 4 | Copyright (c) 1999-2004 Geert Uytterhoeven <geert@linux-m68k.org> |