diff options
| author | Philippe Gerum <rpm@xenomai.org> | 2009-04-08 09:41:55 +0200 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2009-06-12 12:03:46 +0200 |
| commit | 51387009bd4d9fdbc9d4a91e45bd96cc8e3065de (patch) | |
| tree | 281d370e031b5b89e913407f78998729fc5cf0dd /arch/blackfin/include | |
| parent | Blackfin: fix warnings with I/O port macros (diff) | |
| download | linux-51387009bd4d9fdbc9d4a91e45bd96cc8e3065de.tar.xz linux-51387009bd4d9fdbc9d4a91e45bd96cc8e3065de.zip | |
Blackfin: merge Philippe's recent ipipe patch
ipipe-2.6.28.9-blackfin-git95aafe6.patch
Singed-off-by: Philippe Gerum <rpm@xenomai.org>
Signed-off-by: Yi Li <yi.li@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/include')
| -rw-r--r-- | arch/blackfin/include/asm/ipipe.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/include/asm/ipipe.h b/arch/blackfin/include/asm/ipipe.h index 343b56361ec9..51d0bf5e2899 100644 --- a/arch/blackfin/include/asm/ipipe.h +++ b/arch/blackfin/include/asm/ipipe.h @@ -35,10 +35,10 @@ #include <asm/atomic.h> #include <asm/traps.h> -#define IPIPE_ARCH_STRING "1.9-00" +#define IPIPE_ARCH_STRING "1.9-01" #define IPIPE_MAJOR_NUMBER 1 #define IPIPE_MINOR_NUMBER 9 -#define IPIPE_PATCH_NUMBER 0 +#define IPIPE_PATCH_NUMBER 1 #ifdef CONFIG_SMP #error "I-pipe/blackfin: SMP not implemented" |