diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/bcm47xx/board.c | 2 | ||||
| -rw-r--r-- | arch/mips/bcm47xx/nvram.c | 2 | ||||
| -rw-r--r-- | arch/mips/bcm47xx/setup.c | 1 | ||||
| -rw-r--r-- | arch/mips/bcm47xx/sprom.c | 1 | ||||
| -rw-r--r-- | arch/mips/bcm47xx/time.c | 1 | ||||
| -rw-r--r-- | arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 1 | ||||
| -rw-r--r-- | arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h | 21 |
7 files changed, 3 insertions, 26 deletions
diff --git a/arch/mips/bcm47xx/board.c b/arch/mips/bcm47xx/board.c index b3ae068ca4fa..6e8513068325 100644 --- a/arch/mips/bcm47xx/board.c +++ b/arch/mips/bcm47xx/board.c | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | #include <linux/errno.h> | 1 | #include <linux/errno.h> |
| 2 | #include <linux/export.h> | 2 | #include <linux/export.h> |
| 3 | #include <linux/string.h> | 3 | #include <linux/string.h> |
| 4 | #include <bcm47xx.h> | ||
| 4 | #include <bcm47xx_board.h> | 5 | #include <bcm47xx_board.h> |
| 5 | #include <bcm47xx_nvram.h> | ||
| 6 | 6 | ||
| 7 | struct bcm47xx_board_type { | 7 | struct bcm47xx_board_type { |
| 8 | const enum bcm47xx_board board; | 8 | const enum bcm47xx_board board; |
diff --git a/arch/mips/bcm47xx/nvram.c b/arch/mips/bcm47xx/nvram.c index d805d8af415f..7c77a88eedf9 100644 --- a/arch/mips/bcm47xx/nvram.c +++ b/arch/mips/bcm47xx/nvram.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/string.h> | 17 | #include <linux/string.h> |
| 18 | #include <linux/mtd/mtd.h> | 18 | #include <linux/mtd/mtd.h> |
| 19 | #include <bcm47xx_nvram.h> | 19 | #include <linux/bcm47xx_nvram.h> |
| 20 | 20 | ||
| 21 | #define NVRAM_MAGIC 0x48534C46 /* 'FLSH' */ | 21 | #define NVRAM_MAGIC 0x48534C46 /* 'FLSH' */ |
| 22 | #define NVRAM_SPACE 0x8000 | 22 | #define NVRAM_SPACE 0x8000 |
diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c index e43b5046cb30..b26c9c24275e 100644 --- a/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | #include <asm/reboot.h> | 42 | #include <asm/reboot.h> |
| 43 | #include <asm/time.h> | 43 | #include <asm/time.h> |
| 44 | #include <bcm47xx.h> | 44 | #include <bcm47xx.h> |
| 45 | #include <bcm47xx_nvram.h> | ||
| 46 | #include <bcm47xx_board.h> | 45 | #include <bcm47xx_board.h> |
| 47 | 46 | ||
| 48 | union bcm47xx_bus bcm47xx_bus; | 47 | union bcm47xx_bus bcm47xx_bus; |
diff --git a/arch/mips/bcm47xx/sprom.c b/arch/mips/bcm47xx/sprom.c index eff920560689..c114b0239758 100644 --- a/arch/mips/bcm47xx/sprom.c +++ b/arch/mips/bcm47xx/sprom.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <bcm47xx.h> | 29 | #include <bcm47xx.h> |
| 30 | #include <bcm47xx_nvram.h> | ||
| 31 | #include <linux/if_ether.h> | 30 | #include <linux/if_ether.h> |
| 32 | #include <linux/etherdevice.h> | 31 | #include <linux/etherdevice.h> |
| 33 | 32 | ||
diff --git a/arch/mips/bcm47xx/time.c b/arch/mips/bcm47xx/time.c index 2c85d9254b5e..5b46510daa7b 100644 --- a/arch/mips/bcm47xx/time.c +++ b/arch/mips/bcm47xx/time.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/ssb/ssb.h> | 27 | #include <linux/ssb/ssb.h> |
| 28 | #include <asm/time.h> | 28 | #include <asm/time.h> |
| 29 | #include <bcm47xx.h> | 29 | #include <bcm47xx.h> |
| 30 | #include <bcm47xx_nvram.h> | ||
| 31 | #include <bcm47xx_board.h> | 30 | #include <bcm47xx_board.h> |
| 32 | 31 | ||
| 33 | void __init plat_time_init(void) | 32 | void __init plat_time_init(void) |
diff --git a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h index 7527c1d33d02..8ed77f618940 100644 --- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h +++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/ssb/ssb.h> | 22 | #include <linux/ssb/ssb.h> |
| 23 | #include <linux/bcma/bcma.h> | 23 | #include <linux/bcma/bcma.h> |
| 24 | #include <linux/bcma/bcma_soc.h> | 24 | #include <linux/bcma/bcma_soc.h> |
| 25 | #include <linux/bcm47xx_nvram.h> | ||
| 25 | 26 | ||
| 26 | enum bcm47xx_bus_type { | 27 | enum bcm47xx_bus_type { |
| 27 | #ifdef CONFIG_BCM47XX_SSB | 28 | #ifdef CONFIG_BCM47XX_SSB |
diff --git a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h b/arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h deleted file mode 100644 index ee59ffe99922..000000000000 --- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h +++ /dev/null | |||
| @@ -1,21 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2005, Broadcom Corporation | ||
| 3 | * Copyright (C) 2006, Felix Fietkau <nbd@openwrt.org> | ||
| 4 | * | ||
| 5 | * This program is free software; you can redistribute it and/or modify it | ||
| 6 | * under the terms of the GNU General Public License as published by the | ||
| 7 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 8 | * option) any later version. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #ifndef __BCM47XX_NVRAM_H | ||
| 12 | #define __BCM47XX_NVRAM_H | ||
| 13 | |||
| 14 | #include <linux/types.h> | ||
| 15 | #include <linux/kernel.h> | ||
| 16 | |||
| 17 | int bcm47xx_nvram_init_from_mem(u32 base, u32 lim); | ||
| 18 | int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len); | ||
| 19 | int bcm47xx_nvram_gpio_pin(const char *name); | ||
| 20 | |||
| 21 | #endif /* __BCM47XX_NVRAM_H */ | ||