Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3d0b024 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'amba-modalias' of... 

Merge branch 'amba-modalias' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm

* 'amba-modalias' of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
  sound: aaci: Enable module alias autogeneration for AMBA drivers
  watchdog: sp805: Enable module alias autogeneration for AMBA drivers
  fbdev: amba: Enable module alias autogeneration for AMBA drivers
  serial: pl011: Enable module alias autogeneration for AMBA drivers
  serial: pl010: Enable module alias autogeneration for AMBA drivers
  spi: pl022: Enable module alias autogeneration for AMBA drivers
  rtc: pl031: Enable module alias autogeneration for AMBA drivers
  rtc: pl030: Enable module alias autogeneration for AMBA drivers
  mmc: mmci: Enable module alias autogeneration for AMBA drivers
  input: ambakmi: Enable module alias autogeneration for AMBA drivers
  gpio: pl061: Enable module alias autogeneration for AMBA drivers
  dmaengine: pl330: Enable module alias autogeneration for AMBA drivers
  dmaengine: pl08x: Enable module alias autogeneration for AMBA drivers
  hwrng: nomadik: Enable module alias autogeneration for AMBA drivers
  ARM: amba: Auto-generate AMBA driver module aliases during modpost
  ARM: amba: Move definition of struct amba_id to mod_devicetable.h
parents 6ed23fd6 9d5c6273

drivers/amba/bus.c

+4 −0
Original line number Diff line number Diff line
@@ -52,6 +52,10 @@ static int amba_uevent(struct device *dev, struct kobj_uevent_env *env) 
	int retval = 0;



	retval = add_uevent_var(env, "AMBA_ID=%08x", pcdev->periphid);

	if (retval)

		return retval;



	retval = add_uevent_var(env, "MODALIAS=amba:d%08X", pcdev->periphid);

	return retval;

}

#else

drivers/char/hw_random/nomadik-rng.c

+2 −0
Original line number Diff line number Diff line
@@ -95,6 +95,8 @@ static struct amba_id nmk_rng_ids[] = { 
	{0, 0},

};



MODULE_DEVICE_TABLE(amba, nmk_rng_ids);



static struct amba_driver nmk_rng_driver = {

	.drv = {

		.owner = THIS_MODULE,

drivers/dma/amba-pl08x.c

+2 −0
Original line number Diff line number Diff line
@@ -2054,6 +2054,8 @@ static struct amba_id pl08x_ids[] = { 
	{ 0, 0 },

};



MODULE_DEVICE_TABLE(amba, pl08x_ids);



static struct amba_driver pl08x_amba_driver = {

	.drv.name	= DRIVER_NAME,

	.id_table	= pl08x_ids,

drivers/dma/pl330.c

+2 −0
Original line number Diff line number Diff line
@@ -990,6 +990,8 @@ static struct amba_id pl330_ids[] = { 
	{ 0, 0 },

};



MODULE_DEVICE_TABLE(amba, pl330_ids);



#ifdef CONFIG_PM_RUNTIME

static int pl330_runtime_suspend(struct device *dev)

{

drivers/gpio/gpio-pl061.c

+2 −0
Original line number Diff line number Diff line
@@ -346,6 +346,8 @@ static struct amba_id pl061_ids[] = { 
	{ 0, 0 },

};



MODULE_DEVICE_TABLE(amba, pl061_ids);



static struct amba_driver pl061_gpio_driver = {

	.drv = {

		.name	= "pl061_gpio",