diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-03 03:42:39 -0400 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-03 03:42:39 -0400 |
| commit | c61daf6b0a2f7048c6e74d52b043fa6a779b128a (patch) | |
| tree | a4a38656ac79775f38ce5fd6b00dd9b89cd5ccec /arch/arm/mach-bcmring/include/mach/hardware.h | |
| parent | 786c89f7a24b4ed8b68dfb136347267875315c30 (diff) | |
| parent | 160a84cfc975f4aaec1cb32a48bba23ccaf43761 (diff) | |
Merge branch 'imx-cleanup' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-cleanup
Diffstat (limited to 'arch/arm/mach-bcmring/include/mach/hardware.h')
| -rw-r--r-- | arch/arm/mach-bcmring/include/mach/hardware.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-bcmring/include/mach/hardware.h b/arch/arm/mach-bcmring/include/mach/hardware.h index 8bf3564fba50..ed78aabb8e9f 100644 --- a/arch/arm/mach-bcmring/include/mach/hardware.h +++ b/arch/arm/mach-bcmring/include/mach/hardware.h | |||
| @@ -36,8 +36,6 @@ | |||
| 36 | #define RAM_SIZE (CFG_GLOBAL_RAM_SIZE-CFG_GLOBAL_RAM_SIZE_RESERVED) | 36 | #define RAM_SIZE (CFG_GLOBAL_RAM_SIZE-CFG_GLOBAL_RAM_SIZE_RESERVED) |
| 37 | #define RAM_BASE PAGE_OFFSET | 37 | #define RAM_BASE PAGE_OFFSET |
| 38 | 38 | ||
| 39 | #define pcibios_assign_all_busses() 1 | ||
| 40 | |||
| 41 | /* Macros to make managing spinlocks a bit more controlled in terms of naming. */ | 39 | /* Macros to make managing spinlocks a bit more controlled in terms of naming. */ |
| 42 | /* See reg_gpio.h, reg_irq.h, arch.c, gpio.c for example usage. */ | 40 | /* See reg_gpio.h, reg_irq.h, arch.c, gpio.c for example usage. */ |
| 43 | #if defined(__KERNEL__) | 41 | #if defined(__KERNEL__) |