diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /arch/arm/kernel/isa.c | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'arch/arm/kernel/isa.c')
| -rw-r--r-- | arch/arm/kernel/isa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/isa.c b/arch/arm/kernel/isa.c index 54bbd9fe255c..50a30bc91872 100644 --- a/arch/arm/kernel/isa.c +++ b/arch/arm/kernel/isa.c | |||
| @@ -70,5 +70,5 @@ register_isa_ports(unsigned int membase, unsigned int portbase, unsigned int por | |||
| 70 | isa_membase = membase; | 70 | isa_membase = membase; |
| 71 | isa_portbase = portbase; | 71 | isa_portbase = portbase; |
| 72 | isa_portshift = portshift; | 72 | isa_portshift = portshift; |
| 73 | isa_sysctl_header = register_sysctl_table(ctl_bus, 0); | 73 | isa_sysctl_header = register_sysctl_table(ctl_bus); |
| 74 | } | 74 | } |