diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-10 14:46:28 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-10 14:46:51 +0400 |
| commit | 1cad1252ed279ea59f3f8d3d3a5817eeb2f7a4d3 (patch) | |
| tree | ec5af7a70f58ad27ad21fc27815ca164ccf92c36 /include/media/saa7146.h | |
| parent | dcef788eb9659b61a2110284fcce3ca6e63480d2 (diff) | |
| parent | 93cfb3c9fd83d877a8f1ffad9ff862b617b32828 (diff) | |
| download | linux-1cad1252ed279ea59f3f8d3d3a5817eeb2f7a4d3.tar.xz | |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: pick up both v2.6.30-rc1 [which includes tracing/urgent fixes]
and pick up the current lineup of tracing/urgent fixes as well
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/media/saa7146.h')
| -rw-r--r-- | include/media/saa7146.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/media/saa7146.h b/include/media/saa7146.h index fff4235adae5..7a9f76ecbbbd 100644 --- a/include/media/saa7146.h +++ b/include/media/saa7146.h @@ -18,7 +18,7 @@ #include <linux/vmalloc.h> /* for vmalloc() */ #include <linux/mm.h> /* for vmalloc_to_page() */ -#define SAA7146_VERSION_CODE 0x000500 /* 0.5.0 */ +#define SAA7146_VERSION_CODE 0x000600 /* 0.6.0 */ #define saa7146_write(sxy,adr,dat) writel((dat),(sxy->mem+(adr))) #define saa7146_read(sxy,adr) readl(sxy->mem+(adr)) |