diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /arch/blackfin/include/asm/bfin5xx_spi.h | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'arch/blackfin/include/asm/bfin5xx_spi.h')
| -rw-r--r-- | arch/blackfin/include/asm/bfin5xx_spi.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/blackfin/include/asm/bfin5xx_spi.h b/arch/blackfin/include/asm/bfin5xx_spi.h index c281c6328276..ed4f8c6db0cd 100644 --- a/arch/blackfin/include/asm/bfin5xx_spi.h +++ b/arch/blackfin/include/asm/bfin5xx_spi.h | |||
| @@ -3,8 +3,6 @@ | |||
| 3 | * | 3 | * |
| 4 | * Copyright 2004-2008 Analog Devices Inc. | 4 | * Copyright 2004-2008 Analog Devices Inc. |
| 5 | * | 5 | * |
| 6 | * Enter bugs at http://blackfin.uclinux.org/ | ||
| 7 | * | ||
| 8 | * Licensed under the GPL-2 or later. | 6 | * Licensed under the GPL-2 or later. |
| 9 | */ | 7 | */ |
| 10 | 8 | ||