summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp4xx/nslu2-setup.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-23 00:21:57 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-23 00:21:57 +0100
commit1a6a35894f10870d5590199d1785d3a718927abe (patch)
treeab3ab04b0ff2614ed7c322b31cbde9b6481addc1 /arch/arm/mach-ixp4xx/nslu2-setup.c
parentMerge master.kernel.org:/home/rmk/linux-2.6-mmc (diff)
parent[ARM] 3347/1: Bugfix for ixp4xx_set_irq_type() (diff)
downloadlinux-1a6a35894f10870d5590199d1785d3a718927abe.tar.xz
linux-1a6a35894f10870d5590199d1785d3a718927abe.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-ixp4xx/nslu2-setup.c')
-rw-r--r--arch/arm/mach-ixp4xx/nslu2-setup.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c
index f260a9d34f70..55411f21d838 100644
--- a/arch/arm/mach-ixp4xx/nslu2-setup.c
+++ b/arch/arm/mach-ixp4xx/nslu2-setup.c
@@ -50,6 +50,12 @@ static struct platform_device nslu2_i2c_controller = {
.num_resources = 0,
};
+static struct platform_device nslu2_beeper = {
+ .name = "ixp4xx-beeper",
+ .id = NSLU2_GPIO_BUZZ,
+ .num_resources = 0,
+};
+
static struct resource nslu2_uart_resources[] = {
{
.start = IXP4XX_UART1_BASE_PHYS,
@@ -97,6 +103,7 @@ static struct platform_device *nslu2_devices[] __initdata = {
&nslu2_i2c_controller,
&nslu2_flash,
&nslu2_uart,
+ &nslu2_beeper,
};
static void nslu2_power_off(void)