diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 10:25:08 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-03 10:25:08 -0400 |
commit | 0a1340c185734a57fbf4775927966ad4a1347b02 (patch) | |
tree | d9ed8f0dd809a7c542a3356601125ea5b5aaa804 /include/asm-mips/mach-au1x00 | |
parent | af18ddb8864b096e3ed4732e2d4b21c956dcfe3a (diff) | |
parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) |
Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/linux/kernel.h
Diffstat (limited to 'include/asm-mips/mach-au1x00')
-rw-r--r-- | include/asm-mips/mach-au1x00/au1000.h | 1 | ||||
-rw-r--r-- | include/asm-mips/mach-au1x00/au1xxx.h | 1 | ||||
-rw-r--r-- | include/asm-mips/mach-au1x00/au1xxx_dbdma.h | 1 | ||||
-rw-r--r-- | include/asm-mips/mach-au1x00/au1xxx_ide.h | 1 | ||||
-rw-r--r-- | include/asm-mips/mach-au1x00/au1xxx_psc.h | 12 | ||||
-rw-r--r-- | include/asm-mips/mach-au1x00/ioremap.h | 1 |
6 files changed, 9 insertions, 8 deletions
diff --git a/include/asm-mips/mach-au1x00/au1000.h b/include/asm-mips/mach-au1x00/au1000.h index 4686e17c206c..582acd8adb81 100644 --- a/include/asm-mips/mach-au1x00/au1000.h +++ b/include/asm-mips/mach-au1x00/au1000.h | |||
@@ -35,7 +35,6 @@ | |||
35 | #ifndef _AU1000_H_ | 35 | #ifndef _AU1000_H_ |
36 | #define _AU1000_H_ | 36 | #define _AU1000_H_ |
37 | 37 | ||
38 | #include <linux/config.h> | ||
39 | 38 | ||
40 | #ifndef _LANGUAGE_ASSEMBLY | 39 | #ifndef _LANGUAGE_ASSEMBLY |
41 | 40 | ||
diff --git a/include/asm-mips/mach-au1x00/au1xxx.h b/include/asm-mips/mach-au1x00/au1xxx.h index b7b46dd9b929..947135941033 100644 --- a/include/asm-mips/mach-au1x00/au1xxx.h +++ b/include/asm-mips/mach-au1x00/au1xxx.h | |||
@@ -23,7 +23,6 @@ | |||
23 | #ifndef _AU1XXX_H_ | 23 | #ifndef _AU1XXX_H_ |
24 | #define _AU1XXX_H_ | 24 | #define _AU1XXX_H_ |
25 | 25 | ||
26 | #include <linux/config.h> | ||
27 | 26 | ||
28 | #include <asm/mach-au1x00/au1000.h> | 27 | #include <asm/mach-au1x00/au1000.h> |
29 | 28 | ||
diff --git a/include/asm-mips/mach-au1x00/au1xxx_dbdma.h b/include/asm-mips/mach-au1x00/au1xxx_dbdma.h index b327bcd3fee1..d5b38a247e5a 100644 --- a/include/asm-mips/mach-au1x00/au1xxx_dbdma.h +++ b/include/asm-mips/mach-au1x00/au1xxx_dbdma.h | |||
@@ -34,7 +34,6 @@ | |||
34 | #ifndef _AU1000_DBDMA_H_ | 34 | #ifndef _AU1000_DBDMA_H_ |
35 | #define _AU1000_DBDMA_H_ | 35 | #define _AU1000_DBDMA_H_ |
36 | 36 | ||
37 | #include <linux/config.h> | ||
38 | 37 | ||
39 | #ifndef _LANGUAGE_ASSEMBLY | 38 | #ifndef _LANGUAGE_ASSEMBLY |
40 | 39 | ||
diff --git a/include/asm-mips/mach-au1x00/au1xxx_ide.h b/include/asm-mips/mach-au1x00/au1xxx_ide.h index e867b4ef96d1..301e71300779 100644 --- a/include/asm-mips/mach-au1x00/au1xxx_ide.h +++ b/include/asm-mips/mach-au1x00/au1xxx_ide.h | |||
@@ -29,7 +29,6 @@ | |||
29 | * Note: for more information, please refer "AMD Alchemy Au1200/Au1550 IDE | 29 | * Note: for more information, please refer "AMD Alchemy Au1200/Au1550 IDE |
30 | * Interface and Linux Device Driver" Application Note. | 30 | * Interface and Linux Device Driver" Application Note. |
31 | */ | 31 | */ |
32 | #include <linux/config.h> | ||
33 | 32 | ||
34 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA | 33 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA |
35 | #define DMA_WAIT_TIMEOUT 100 | 34 | #define DMA_WAIT_TIMEOUT 100 |
diff --git a/include/asm-mips/mach-au1x00/au1xxx_psc.h b/include/asm-mips/mach-au1x00/au1xxx_psc.h index 8e5fb3c7da4d..1bd4e27caf6b 100644 --- a/include/asm-mips/mach-au1x00/au1xxx_psc.h +++ b/include/asm-mips/mach-au1x00/au1xxx_psc.h | |||
@@ -33,14 +33,18 @@ | |||
33 | #ifndef _AU1000_PSC_H_ | 33 | #ifndef _AU1000_PSC_H_ |
34 | #define _AU1000_PSC_H_ | 34 | #define _AU1000_PSC_H_ |
35 | 35 | ||
36 | #include <linux/config.h> | ||
37 | 36 | ||
38 | /* The PSC base addresses. */ | 37 | /* The PSC base addresses. */ |
39 | #ifdef CONFIG_SOC_AU1550 | 38 | #ifdef CONFIG_SOC_AU1550 |
40 | #define PSC0_BASE_ADDR 0xb1a00000 | 39 | #define PSC0_BASE_ADDR 0xb1a00000 |
41 | #define PSC1_BASE_ADDR 0xb1b00000 | 40 | #define PSC1_BASE_ADDR 0xb1b00000 |
42 | #define PSC2_BASE_ADDR 0xb0a00000 | 41 | #define PSC2_BASE_ADDR 0xb0a00000 |
43 | #define PSC3_BASE_ADDR 0xb0d00000 | 42 | #define PSC3_BASE_ADDR 0xb0b00000 |
43 | #endif | ||
44 | |||
45 | #ifdef CONFIG_SOC_AU1200 | ||
46 | #define PSC0_BASE_ADDR 0xb1a00000 | ||
47 | #define PSC1_BASE_ADDR 0xb1b00000 | ||
44 | #endif | 48 | #endif |
45 | 49 | ||
46 | /* The PSC select and control registers are common to | 50 | /* The PSC select and control registers are common to |
@@ -228,6 +232,8 @@ typedef struct psc_i2s { | |||
228 | #define PSC_I2SCFG_DD_DISABLE (1 << 27) | 232 | #define PSC_I2SCFG_DD_DISABLE (1 << 27) |
229 | #define PSC_I2SCFG_DE_ENABLE (1 << 26) | 233 | #define PSC_I2SCFG_DE_ENABLE (1 << 26) |
230 | #define PSC_I2SCFG_SET_WS(x) (((((x) / 2) - 1) & 0x7f) << 16) | 234 | #define PSC_I2SCFG_SET_WS(x) (((((x) / 2) - 1) & 0x7f) << 16) |
235 | #define PSC_I2SCFG_WS(n) ((n & 0xFF) << 16) | ||
236 | #define PSC_I2SCFG_WS_MASK (PSC_I2SCFG_WS(0x3F)) | ||
231 | #define PSC_I2SCFG_WI (1 << 15) | 237 | #define PSC_I2SCFG_WI (1 << 15) |
232 | 238 | ||
233 | #define PSC_I2SCFG_DIV_MASK (3 << 13) | 239 | #define PSC_I2SCFG_DIV_MASK (3 << 13) |
@@ -506,7 +512,7 @@ typedef struct psc_smb { | |||
506 | 512 | ||
507 | /* Transmit register control. | 513 | /* Transmit register control. |
508 | */ | 514 | */ |
509 | #define PSC_SMBTXRX_RSR (1 << 30) | 515 | #define PSC_SMBTXRX_RSR (1 << 28) |
510 | #define PSC_SMBTXRX_STP (1 << 29) | 516 | #define PSC_SMBTXRX_STP (1 << 29) |
511 | #define PSC_SMBTXRX_DATAMASK (0xff) | 517 | #define PSC_SMBTXRX_DATAMASK (0xff) |
512 | 518 | ||
diff --git a/include/asm-mips/mach-au1x00/ioremap.h b/include/asm-mips/mach-au1x00/ioremap.h index d3ec6274575a..098fca4289bb 100644 --- a/include/asm-mips/mach-au1x00/ioremap.h +++ b/include/asm-mips/mach-au1x00/ioremap.h | |||
@@ -9,7 +9,6 @@ | |||
9 | #ifndef __ASM_MACH_AU1X00_IOREMAP_H | 9 | #ifndef __ASM_MACH_AU1X00_IOREMAP_H |
10 | #define __ASM_MACH_AU1X00_IOREMAP_H | 10 | #define __ASM_MACH_AU1X00_IOREMAP_H |
11 | 11 | ||
12 | #include <linux/config.h> | ||
13 | #include <linux/types.h> | 12 | #include <linux/types.h> |
14 | 13 | ||
15 | #ifdef CONFIG_64BIT_PHYS_ADDR | 14 | #ifdef CONFIG_64BIT_PHYS_ADDR |