diff options
author | Daniel Silverstone <dsilvers@simtec.co.uk> | 2008-12-13 15:44:12 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-12-14 06:34:47 -0500 |
commit | 72880ad866c21badace4d8026c1e58f2fde087fb (patch) | |
tree | 83a2a5a7f46ef890426ee83c931c14ac325724be /arch/arm/mach-ks8695/board-micrel.c | |
parent | fbd627100bc4a9ebce8c7617df499ee5db763780 (diff) |
[ARM] KS8695: Fixup the KS8695 GPIO to be GPIOLIB
This patch is as small a change as possible to the KS8695 GPIO layer
to use GPIOLIB to allow the generic GPIO expanders and the like to
be compiled.
As a side-effect, we also remove __init_or_module from several
functions which could be called by drivers such as i2c-gpio which
could plausibly be compiled into a non-modular kernel.
Signed-off-by: Daniel Silverstone <dsilvers@simtec.co.uk>
Signed-off-by: Vincent Sanders <vince@simtec.co.uk>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-ks8695/board-micrel.c')
-rw-r--r-- | arch/arm/mach-ks8695/board-micrel.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-ks8695/board-micrel.c b/arch/arm/mach-ks8695/board-micrel.c index 0468e93b7d3b..8ceaf5ac6e2c 100644 --- a/arch/arm/mach-ks8695/board-micrel.c +++ b/arch/arm/mach-ks8695/board-micrel.c | |||
@@ -18,6 +18,7 @@ | |||
18 | #include <asm/mach/map.h> | 18 | #include <asm/mach/map.h> |
19 | #include <asm/mach/irq.h> | 19 | #include <asm/mach/irq.h> |
20 | 20 | ||
21 | #include <mach/gpio.h> | ||
21 | #include <mach/devices.h> | 22 | #include <mach/devices.h> |
22 | 23 | ||
23 | #include "generic.h" | 24 | #include "generic.h" |
@@ -39,6 +40,8 @@ static void __init micrel_init(void) | |||
39 | { | 40 | { |
40 | printk(KERN_INFO "Micrel KS8695 Development Board initializing\n"); | 41 | printk(KERN_INFO "Micrel KS8695 Development Board initializing\n"); |
41 | 42 | ||
43 | ks8695_register_gpios(); | ||
44 | |||
42 | #ifdef CONFIG_PCI | 45 | #ifdef CONFIG_PCI |
43 | ks8695_init_pci(&micrel_pci); | 46 | ks8695_init_pci(&micrel_pci); |
44 | #endif | 47 | #endif |