diff --git a/[refs] b/[refs] index 7515fbf6c7a2..36b80f0fe14a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3ae0fc34f58e7163b7724feb3d77aa4603f0dc3 +refs/heads/master: 6835a209f6c24b3704aa58d8b558a513a5a08c52 diff --git a/trunk/drivers/char/rocket.c b/trunk/drivers/char/rocket.c index 86308830ac42..3e4e73a0d7c1 100644 --- a/trunk/drivers/char/rocket.c +++ b/trunk/drivers/char/rocket.c @@ -1764,7 +1764,7 @@ static void rp_flush_buffer(struct tty_struct *tty) #ifdef CONFIG_PCI -static struct pci_device_id __devinitdata rocket_pci_ids[] = { +static struct pci_device_id __devinitdata __used rocket_pci_ids[] = { { PCI_DEVICE(PCI_VENDOR_ID_RP, PCI_ANY_ID) }, { } };