Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 127999
b: refs/heads/master
c: df8e5bc
h: refs/heads/master
i:
  127997: c99d6a5
  127995: 0011ecc
  127991: 1dfae0c
  127983: 1f0808d
  127967: 7b3997d
  127935: 2fe46bd
  127871: 262e8f9
  127743: 3e60ee1
  127487: 0882586
  126975: 5a59775
v: v3
  • Loading branch information
Adrian Bunk authored and Kyle McMartin committed Jan 5, 2009
1 parent e919bb0 commit c3235cf
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 17 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8f47cb87eb603fac557a8408c23701dffad07581
refs/heads/master: df8e5bc6b7b61c8b2aeaf58b6afd762d20a651dd
3 changes: 1 addition & 2 deletions trunk/drivers/parisc/asp.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ static void asp_choose_irq(struct parisc_device *dev, void *ctrl)
*/
#define ASP_INTERRUPT_ADDR 0xf0800000

int __init
asp_init_chip(struct parisc_device *dev)
static int __init asp_init_chip(struct parisc_device *dev)
{
struct gsc_irq gsc_irq;
int ret;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/parisc/ccio-dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ static u32 hint_lookup[] = {
* (Load Coherence Index) instruction. The 8 bits used for the virtual
* index are bits 12:19 of the value returned by LCI.
*/
void CCIO_INLINE
static void CCIO_INLINE
ccio_io_pdir_entry(u64 *pdir_ptr, space_t sid, unsigned long vba,
unsigned long hints)
{
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/parisc/dino.c
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ DINO_PORT_OUT(b, 8, 3)
DINO_PORT_OUT(w, 16, 2)
DINO_PORT_OUT(l, 32, 0)

struct pci_port_ops dino_port_ops = {
static struct pci_port_ops dino_port_ops = {
.inb = dino_in8,
.inw = dino_in16,
.inl = dino_in32,
Expand Down Expand Up @@ -690,7 +690,7 @@ dino_fixup_bus(struct pci_bus *bus)
}


struct pci_bios_ops dino_bios_ops = {
static struct pci_bios_ops dino_bios_ops = {
.init = dino_bios_init,
.fixup_bus = dino_fixup_bus
};
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/parisc/hppb.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ struct hppb_card {
struct hppb_card *next;
};

struct hppb_card hppb_card_head = {
static struct hppb_card hppb_card_head = {
.hpa = 0,
.next = NULL,
};
Expand Down
5 changes: 2 additions & 3 deletions trunk/drivers/parisc/lasi.c
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ lasi_init_irq(struct gsc_asic *this_lasi)

#else

void __init lasi_led_init(unsigned long lasi_hpa)
static void __init lasi_led_init(unsigned long lasi_hpa)
{
unsigned long datareg;

Expand Down Expand Up @@ -163,8 +163,7 @@ static void lasi_power_off(void)
gsc_writel(0x02, datareg);
}

int __init
lasi_init_chip(struct parisc_device *dev)
static int __init lasi_init_chip(struct parisc_device *dev)
{
extern void (*chassis_power_off)(void);
struct gsc_asic *lasi;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/parisc/lba_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -824,7 +824,7 @@ lba_fixup_bus(struct pci_bus *bus)
}


struct pci_bios_ops lba_bios_ops = {
static struct pci_bios_ops lba_bios_ops = {
.init = lba_bios_init,
.fixup_bus = lba_fixup_bus,
};
Expand Down
7 changes: 3 additions & 4 deletions trunk/drivers/parisc/sba_iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ typedef unsigned long space_t;
* IOMMU uses little endian for the pdir.
*/

void SBA_INLINE
static void SBA_INLINE
sba_io_pdir_entry(u64 *pdir_ptr, space_t sid, unsigned long vba,
unsigned long hint)
{
Expand Down Expand Up @@ -1874,7 +1874,7 @@ static struct parisc_device_id sba_tbl[] = {
{ 0, }
};

int sba_driver_callback(struct parisc_device *);
static int sba_driver_callback(struct parisc_device *);

static struct parisc_driver sba_driver = {
.name = MODULE_NAME,
Expand All @@ -1887,8 +1887,7 @@ static struct parisc_driver sba_driver = {
** If so, initialize the chip and tell other partners in crime they
** have work to do.
*/
int
sba_driver_callback(struct parisc_device *dev)
static int sba_driver_callback(struct parisc_device *dev)
{
struct sba_device *sba_dev;
u32 func_class;
Expand Down
3 changes: 1 addition & 2 deletions trunk/drivers/parisc/wax.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@ wax_init_irq(struct gsc_asic *wax)
// gsc_writel(0xFFFFFFFF, base+0x2000); /* RS232-B on Wax */
}

int __init
wax_init_chip(struct parisc_device *dev)
static int __init wax_init_chip(struct parisc_device *dev)
{
struct gsc_asic *wax;
struct parisc_device *parent;
Expand Down

0 comments on commit c3235cf

Please sign in to comment.