diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-10-22 12:28:19 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-10-22 12:28:19 -0400 |
| commit | 7efb35af738e96565934cc640d863eb18dba0206 (patch) | |
| tree | 29ed331d864b0cfa73fdca5fd3982896e56f9530 /arch/blackfin/mach-bf561/boards/cm_bf561.c | |
| parent | 748c5151deb56e4b7b5a9b07a884243764933831 (diff) | |
| parent | 55b70a0300b873c0ec7ea6e33752af56f41250ce (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/blackfin/mach-bf561/boards/cm_bf561.c')
| -rw-r--r-- | arch/blackfin/mach-bf561/boards/cm_bf561.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c index cd827a1b6ba1..97aeb43fd8b4 100644 --- a/arch/blackfin/mach-bf561/boards/cm_bf561.c +++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | /* | 42 | /* |
| 43 | * Name the Board for the /proc/cpuinfo | 43 | * Name the Board for the /proc/cpuinfo |
| 44 | */ | 44 | */ |
| 45 | char *bfin_board_name = "Bluetechnix CM BF561"; | 45 | const char bfin_board_name[] = "Bluetechnix CM BF561"; |
| 46 | 46 | ||
| 47 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) | 47 | #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE) |
| 48 | /* all SPI peripherals info goes here */ | 48 | /* all SPI peripherals info goes here */ |