diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-12-14 13:23:03 -0500 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-12-14 13:23:03 -0500 |
| commit | 559300bc0ef7ccd541656f1189d38e7088389559 (patch) | |
| tree | cd1682881ca4246e9c5a1e8632be4bdd9d9706c6 /arch/blackfin/include/asm/nand.h | |
| parent | 5416bf33f92a4104dbcd6062bf377c8421ca3cfd (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge commit 'v2.6.32'
Conflicts:
arch/avr32/mach-at32ap/include/mach/cpu.h
Diffstat (limited to 'arch/blackfin/include/asm/nand.h')
| -rw-r--r-- | arch/blackfin/include/asm/nand.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/blackfin/include/asm/nand.h b/arch/blackfin/include/asm/nand.h index afbaafa793f1..3ae8b569edfc 100644 --- a/arch/blackfin/include/asm/nand.h +++ b/arch/blackfin/include/asm/nand.h | |||
| @@ -1,13 +1,9 @@ | |||
| 1 | /* linux/include/asm-blackfin/nand.h | 1 | /* |
| 2 | * | ||
| 3 | * Copyright (c) 2007 Analog Devices, Inc. | ||
| 4 | * Bryan Wu <bryan.wu@analog.com> | ||
| 5 | * | ||
| 6 | * BF5XX - NAND flash controller platfrom_device info | 2 | * BF5XX - NAND flash controller platfrom_device info |
| 7 | * | 3 | * |
| 8 | * This program is free software; you can redistribute it and/or modify | 4 | * Copyright 2007-2008 Analog Devices, Inc. |
| 9 | * it under the terms of the GNU General Public License version 2 as | 5 | * |
| 10 | * published by the Free Software Foundation. | 6 | * Licensed under the GPL-2 |
| 11 | */ | 7 | */ |
| 12 | 8 | ||
| 13 | /* struct bf5xx_nand_platform | 9 | /* struct bf5xx_nand_platform |