summaryrefslogtreecommitdiff
path: root/arch/sh/include/asm/device.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-01-12 07:57:41 +0400
committerPaul Mundt <lethal@linux-sh.org>2012-01-12 07:57:41 +0400
commit9d14070f656addddce3d63fd483de46930b51850 (patch)
treea8767c2547dd2b6f49974503a5169d8c08de00e9 /arch/sh/include/asm/device.h
parent9f06cf38eca57e279b4c78e465e19f10c2f78174 (diff)
parenta319add1e24c43d285b781332cfa532405466650 (diff)
downloadlinux-9d14070f656addddce3d63fd483de46930b51850.tar.xz
Merge branch 'sh/hwblk' into sh-latest
Diffstat (limited to 'arch/sh/include/asm/device.h')
-rw-r--r--arch/sh/include/asm/device.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/include/asm/device.h b/arch/sh/include/asm/device.h
index 783ecdc64e25..a1c9c0daec10 100644
--- a/arch/sh/include/asm/device.h
+++ b/arch/sh/include/asm/device.h
@@ -15,5 +15,4 @@ int platform_resource_setup_memory(struct platform_device *pdev,
void plat_early_device_setup(void);
struct pdev_archdata {
- int hwblk_id;
};