diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-06 05:51:07 -0400 |
| commit | 012e060c95e547eceea4a12c6f58592473bf4011 (patch) | |
| tree | b57d3eafb50ce517577d2cf366c9ef0b4b286589 /drivers/mtd/maps/ixp4xx.c | |
| parent | 923f122573851d18a3832ca808269fa2d5046fb1 (diff) | |
| parent | ed39f731ab2e77e58122232f6e27333331d7793d (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/mtd/maps/ixp4xx.c')
| -rw-r--r-- | drivers/mtd/maps/ixp4xx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mtd/maps/ixp4xx.c b/drivers/mtd/maps/ixp4xx.c index 5afe660aa2c4..3fcc32884074 100644 --- a/drivers/mtd/maps/ixp4xx.c +++ b/drivers/mtd/maps/ixp4xx.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/ioport.h> | 26 | #include <linux/ioport.h> |
| 27 | #include <linux/device.h> | 27 | #include <linux/device.h> |
| 28 | #include <asm/io.h> | 28 | #include <asm/io.h> |
| 29 | #include <asm/mach-types.h> | ||
| 30 | #include <asm/mach/flash.h> | 29 | #include <asm/mach/flash.h> |
| 31 | 30 | ||
| 32 | #include <linux/reboot.h> | 31 | #include <linux/reboot.h> |
| @@ -254,6 +253,6 @@ module_init(ixp4xx_flash_init); | |||
| 254 | module_exit(ixp4xx_flash_exit); | 253 | module_exit(ixp4xx_flash_exit); |
| 255 | 254 | ||
| 256 | MODULE_LICENSE("GPL"); | 255 | MODULE_LICENSE("GPL"); |
| 257 | MODULE_DESCRIPTION("MTD map driver for Intel IXP4xx systems") | 256 | MODULE_DESCRIPTION("MTD map driver for Intel IXP4xx systems"); |
| 258 | MODULE_AUTHOR("Deepak Saxena"); | 257 | MODULE_AUTHOR("Deepak Saxena"); |
| 259 | 258 | ||